Marien Fressinaud 0b89867800 Merge branch 'dev' into 252-extensions ...

Conflicts:
	app/i18n/en/admin.php
	app/i18n/en/feedback.php
	app/i18n/en/gen.php
	app/i18n/fr/admin.php
	app/i18n/fr/feedback.php
	app/i18n/fr/gen.php
	app/views/index/normal.phtml

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

..

Minz

Merge branch 'dev' into 252-extensions

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

SimplePie

SimplePie: Added unconventional mime type for RSS

2014-11-12 22:42:47 +01:00

.htaccess

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

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

http-conditional.php

PHP : suppression autres alertes

2013-12-02 20:12:55 +01:00

JSON.php

PHP : JSON alternative

2013-12-01 16:55:41 +01:00

lib_date.php

lib_date comment

2014-06-01 14:56:50 +02:00

lib_opml.php

Reorganise menus (aside and header)

2014-10-17 16:24:21 +02:00

lib_phpQuery.php

Détails : blancs

2013-11-04 23:34:07 +01:00

lib_rss.php

Merge branch 'dev' into 252-extensions

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

password_compat.php

README blibliothèques incluses + ajout librairies pour le mot de passe

2014-01-11 15:38:41 +01:00