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

..

aside_configure.phtml

Merge branch 'dev' into 252-extensions

2014-12-17 21:41:33 +01:00

aside_feed.phtml

Fix last calls to Minz_Configuration methods

2015-01-06 20:50:58 +01:00

aside_stats.phtml

Update i18n for statistics

2014-12-11 16:10:39 +01:00

aside_subscription.phtml

Fix i18n for aside subscription

2014-12-10 22:37:49 +01:00

header.phtml

Merge branch 'dev' into 252-extensions

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

layout.phtml

Fix last calls to Minz_Configuration methods

2015-01-06 20:50:58 +01:00

nav_entries.phtml

Use _i() whenever it is possible

2014-10-05 16:10:25 +02:00

nav_menu.phtml

Fix last calls to Minz_Configuration methods

2015-01-06 20:50:58 +01:00