Tags: loic-cariou/sulu
Tags
Merge branch '2.1' of https://github.com/sulu/sulu into 2.2 Conflicts: src/Sulu/Bundle/AdminBundle/Resources/js/containers/Application/tests/Application.test.js src/Sulu/Bundle/AdminBundle/Resources/js/containers/ProfileFormOverlay/ProfileFormOverlay.js src/Sulu/Bundle/AdminBundle/Resources/js/containers/ProfileFormOverlay/tests/ProfileFormOverlay.test.js
Merge branch '2.1' of https://github.com/sulu/sulu into 2.2 Conflicts: src/Sulu/Bundle/AdminBundle/Resources/js/containers/Form/fields/SingleSelect.js
Merge branch '2.1' of https://github.com/sulu/sulu into 2.2 Conflicts: UPGRADE.md
Merge branch 'release/2.1' of https://github.com/sulu/sulu into relea… …se/2.2
PreviousNext