Marien Fressinaud 2b8dc66634 Merge branch 'user-queries' of https://github.com/aledeg/FreshRSS into aledeg-user-queries ...

Conflicts:
	app/layout/nav_menu.phtml

2014-06-13 20:20:43 +02:00

..

Controllers

Merge branch 'user-queries' of https://github.com/aledeg/FreshRSS into aledeg-user-queries

2014-06-13 20:20:43 +02:00

Exceptions

Better OPML import / export

2014-03-29 20:18:57 +01:00

i18n

Merge branch 'user-queries' of https://github.com/aledeg/FreshRSS into aledeg-user-queries

2014-06-13 20:20:43 +02:00

layout

Merge branch 'user-queries' of https://github.com/aledeg/FreshRSS into aledeg-user-queries

2014-06-13 20:20:43 +02:00

Models

Merge branch 'user-queries' of https://github.com/aledeg/FreshRSS into aledeg-user-queries

2014-06-13 20:20:43 +02:00

views

Merge branch 'user-queries' of https://github.com/aledeg/FreshRSS into aledeg-user-queries

2014-06-13 20:20:43 +02:00

.htaccess

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

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

actualize_script.php

Minz: remove one layer of ob_ (experimental)

2014-03-22 17:56:07 +01:00

FreshRSS.php

Actualize : Tolère PHP lancé en CGI plutôt que CLI

2014-02-01 12:23:12 +01:00

index.html

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

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

sql.php

SQL : Supprime c.color

2014-02-11 15:30:52 +01:00