2 Commits (06fbcc27f14bb6c9f799c0031976ffa56f09d664)

Author	SHA1	Message	Date
noud	253d8e1b58	Merge branch 'master' into develop ... Conflicts: app/Controller/EventsController.php app/Model/Attribute.php app/View/Events/view.ctp	2012-09-17 13:02:53 +02:00
Christophe Vandeplas	865a24d0bd	Migration to CakePHP 2.1. ... Most of the functionality migrated, Q&A review required.	2012-03-15 15:06:45 +01:00