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

Browse Source

Conflicts:
	app/Controllers/indexController.php

...

This commit is contained in:

Alexis Degrugillier

2014-03-01 14:35:21 -05:00

parent 736ee492a0 867069d099

commit c56cd80917

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available