Merge 2.x into master

sonata-project · Jun 8, 2016 · d3cc993 · d3cc993
2 parents dec48ad + 56d8819
commit d3cc993
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 233 deletions.
diff --git a/build.xml b/build.xml
diff --git a/composer.json b/composer.json
@@ -38,7 +38,7 @@
     },
     "conflict": {
         "knplabs/doctrine-behaviors": "<1.0 || >=2.0",
-        "sonata-project/doctrine-orm-admin-bundle": "<2.2 || >=3.0",
+        "sonata-project/doctrine-orm-admin-bundle": "<3.0 || >=4.0",
         "sonata-project/doctrine-phpcr-admin-bundle": "<2.0 || >=3.0",
         "stof/doctrine-extensions-bundle": "<1.1 || >=2.0"
     },