Marien Fressinaud 5072774f02 Merge branch 'htmlencoding' of https://github.com/Alkarex/FreshRSS into Alkarex-htmlencoding ...

Conflicts:
	app/models/Feed.php

2013-09-14 18:36:43 +02:00

..

configuration

Fix issue #59 : ajout des répertoires vides, obligatoires pour le fonctionnement de FreshRSS

2013-04-17 18:30:14 +02:00

controllers

Merge branch 'onread_jump_next' of https://github.com/Alkarex/FreshRSS into Alkarex-onread_jump_next

2013-09-14 18:13:21 +02:00

i18n

Issue #143 : amélioration du formulaire

2013-09-14 18:25:10 +02:00

layout

Merge branch 'onread_jump_next' of https://github.com/Alkarex/FreshRSS into Alkarex-onread_jump_next

2013-09-14 18:13:21 +02:00

models

Merge branch 'htmlencoding' of https://github.com/Alkarex/FreshRSS into Alkarex-htmlencoding

2013-09-14 18:36:43 +02:00

views

Issue #143 : amélioration du formulaire

2013-09-14 18:25:10 +02:00

App_FrontController.php

Fix issue #110 : ajout CSS pour imprimante

2013-08-18 02:13:59 +02:00