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

..

Controllers

Merge branch 'dev' into 252-extensions

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

Exceptions

Fix a set of TODO and bugs

2014-10-22 17:57:22 +02:00

i18n

Merge branch 'dev' into 252-extensions

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

layout

Merge branch 'dev' into 252-extensions

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

Models

Add system config setter methods

2015-01-07 18:55:18 +01:00

SQL

Add checking installation feature

2014-10-20 11:54:31 +02:00

views

Merge branch 'dev' into 252-extensions

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

.htaccess

Déplacement de ./actualize_script.php sous ./app/

2013-12-26 13:26:05 +01:00

actualize_script.php

Coding style in actualize_script

2015-01-06 23:07:57 +01:00

FreshRSS.php

Merge branch 'dev' into 252-extensions

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

index.html

Déplacement de ./actualize_script.php sous ./app/

2013-12-26 13:26:05 +01:00

install.php

Merge branch 'dev' into 252-extensions

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