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

..

cache

Multi-utilisateur fonctionnel avec Mozilla Persona

2013-12-31 14:52:01 +01:00

favicons

Multi-utilisateur fonctionnel avec Mozilla Persona

2013-12-31 14:52:01 +01:00

persona

Multi-utilisateur fonctionnel avec Mozilla Persona

2013-12-31 14:52:01 +01:00

tokens

Long term cookie to keep session open

2014-08-13 00:09:48 +02:00

users

Merge branch 'dev' into 252-extensions

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

.gitignore

BREAKING FEATURE: move user data

2014-12-21 13:10:02 +01:00

.htaccess

Protection répertoire data

2013-11-17 12:31:51 +01:00

config.default.php

Merge branch 'dev' into 252-extensions

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

do-install.txt

New install logic

2014-07-03 21:20:11 +02:00

index.html

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

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

shares.php

Improve sharing

2014-02-22 17:03:36 -05:00