Merge branch 4.0

This commit is contained in:
Thibaud Fabre
2016-12-05 15:26:48 +01:00
parent f6700fbe12
commit b5bbb1851f
315 changed files with 6552 additions and 29445 deletions

View File

@@ -79,4 +79,4 @@ $app->command(new CrossDomainGenerator());
$app['phraseanet.setup_mode'] = true;
exit(is_int($app->run()) ? : 1);
$app->run();