echarp af5104ca31 Merge conflit corrected		2016-01-18 18:00:28 +01:00
..
admin	Possibility to edit and create orga kinds	2016-01-13 22:47:18 +01:00
assets	Important pagination correction	2016-01-18 00:24:53 +01:00
controllers	Quick correction on the rss feed, ordering by id and limited to 20 elements	2016-01-10 23:41:03 +01:00
helpers	Better organisation meta description	2016-01-10 15:38:30 +01:00
mailers	Champs "active" et "description" ajoutés aux organisations. Refs #12	2015-12-26 23:32:04 +01:00
models	Merge conflit corrected	2016-01-18 18:00:28 +01:00
views	Attempt to a quick correction	2016-01-11 13:06:39 +01:00