Benoît Burnichon 60b932d518 Merge branch '4.0' into merge-4.0 ...

- Ignore modifications in Vagrantfile. Complete rework switching to ansible
- redo composer update of roave/security-advisories and symfony/symfony
- confirm deletion of jquery.WorkZone.js

Conflicts:
	Vagrantfile
	composer.lock
	resources/www/prod/js/jquery.WorkZone.js

2016-05-12 10:43:30 +02:00

..

ansible

Fixup some permission/cs issues in ansible files

2016-02-11 16:12:54 +01:00

examples

Update directory structure & allow to configure paths (tmp, log, cache)

2014-09-05 15:57:00 +02:00

gulp

clean and remove thesaurus dead code

2016-03-29 12:20:25 +02:00

hudson

Replace app['phraseanet.appbox']->get_databox using trait

2015-07-02 12:27:26 +02:00

locales

Translation Dump for added keys

2016-02-24 17:23:24 +01:00

proxies

Update directory structure & allow to configure paths (tmp, log, cache)

2014-09-05 15:57:00 +02:00

vagrant

Remove now useless puphpet files

2016-01-07 14:28:32 +01:00

www

Merge branch '4.0' into merge-4.0

2016-05-12 10:43:30 +02:00