Merge branch 'share' of https://github.com/aledeg/FreshRSS into share

Conflicts:
	app/Models/Configuration.php
pull/447/head
Alexis Degrugillier 11 years ago
commit 20ebf987b4

Diff Content Not Available