Romain Neutron ba25b8cc7c Merge with 3.7

2012-10-04 12:49:01 +02:00

..

Admin.php

post merge cleanup

2012-09-19 15:39:52 +02:00

Api.php

undo change

2012-09-07 17:02:48 +02:00

ApiVersion.php

Cleanup applications

2012-07-18 18:08:31 +02:00

Lightbox.php

Fix merge

2012-09-27 14:53:24 +02:00

OAuth2.php

Merge 3.7

2012-09-07 18:22:52 +02:00

Overview.php

Merge with 3.7

2012-10-04 12:49:01 +02:00

Prod.php

Fix tests

2012-09-12 15:35:01 +02:00

Root.php

rename jquery.Phraseanet.js to jquery.Mustache.js

2012-09-03 18:09:02 +02:00

Setup.php

Fix #901 : allow upgrade from Phraseanet 3.1

2012-09-27 14:22:31 +02:00