Marien Fressinaud dd5273871a Merge branch 'AvoidNonCacheableJavaScript' of https://github.com/Alkarex/FreshRSS into Alkarex-AvoidNonCacheableJavaScript ...

Conflicts:
	app/views/javascript/main.phtml

2013-10-26 16:49:44 +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 'AvoidNonCacheableJavaScript' of https://github.com/Alkarex/FreshRSS into Alkarex-AvoidNonCacheableJavaScript

2013-10-26 16:49:44 +02:00

i18n

Merge branch 'patch-3' of https://github.com/Alkarex/FreshRSS into hotfixes

2013-10-15 11:26:09 +02:00

layout

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

2013-10-26 16:49:44 +02:00

models

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

2013-10-26 16:42:55 +02:00

views

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

2013-10-26 16:49:44 +02:00

App_FrontController.php

Fix issue #165: @import CSS enlevés

2013-10-07 11:31:12 +02:00