Nicolas Le Goff 43a396eb8e Merge branch '3.6' of github.com:alchemy-fr/Phraseanet into 3.6

2012-01-03 16:35:02 +01:00

..

Admin

Merge with master

2011-12-26 18:39:41 +01:00

Prod

Push Controllers

2012-01-02 12:52:46 +01:00

Root

Fix Tests

2011-12-30 11:04:06 +01:00

Setup

remove write config add servername to registry

2012-01-03 14:31:45 +01:00

Utils

move controllers

2011-12-14 20:08:32 +01:00