Merge branch 'share' of https://github.com/aledeg/FreshRSS into share
Conflicts: app/Models/Configuration.phppull/447/head
commit
20ebf987b4
Conflicts: app/Models/Configuration.phppull/447/head