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
..
2016-01-05 13:38:14 +01:00
2016-04-20 16:22:14 +02:00
2016-04-20 16:22:14 +02:00
2015-07-08 13:45:24 +02:00
2016-04-22 19:44:05 +02:00
2016-04-20 16:22:14 +02:00
2016-01-22 17:29:45 +01:00
2016-02-04 10:34:15 +01:00
2016-05-12 10:43:30 +02:00
2016-01-05 13:38:14 +01:00
2015-07-08 13:46:17 +02:00
2015-07-08 13:46:17 +02:00
2014-03-03 15:10:39 +01:00
2016-01-05 13:38:14 +01:00
2016-01-05 13:38:14 +01:00
2015-02-18 19:04:10 +01:00
2016-02-16 19:13:28 +01:00