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

..

adapter.php

Refactor getChildren() and get_grouping_parents()

2016-05-11 17:50:57 +02:00

exportElement.php

This is a combination of 33 commits.

2016-04-20 16:22:14 +02:00

orderElement.php

bump copyright year

2016-01-05 13:38:14 +01:00

preview.php

This is a combination of 33 commits.

2016-04-20 16:22:14 +02:00