Marien Fressinaud 73023bc12b Merge branch 'dev' into 252-extensions ...

Conflicts:
	app/FreshRSS.php
	app/Models/Configuration.php
	app/views/index/index.phtml
	app/views/index/normal.phtml
	lib/Minz/Configuration.php
	lib/Minz/Translate.php
	lib/lib_rss.php

2015-01-08 14:18:32 +01:00

18 KiB

Raw Blame History

View Raw