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

..

aside_configure.phtml

Add user queries

2014-05-04 17:23:53 -04:00

aside_feed.phtml

Prevent click on bookmarklet

2014-03-30 19:23:34 +02:00

aside_flux.phtml

Add user queries

2014-05-04 17:23:53 -04:00

header.phtml

Add user queries

2014-05-04 17:23:53 -04:00

layout.phtml

Fix theme Origine2

2014-06-03 23:41:19 +02:00

nav_entries.phtml

Grosse refactorisation pour permettre le chargement automatique des classes

2013-12-15 03:30:24 +01:00

nav_menu.phtml

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

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