Commit Graph

2 Commits (e242c9add223df0d0190e4706ad5480bf3f7ad11)

Author SHA1 Message Date
noud 957b3e27b8 Merge branch 'master' into develop
Conflicts:
	app/Controller/ServersController.php
2012-11-20 11:01:18 +01: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