Merge pull request #54 from szymach/development

Update admin bundle dependency to ~2.0@dev, set alias to 2.0-dev
fsi-open · Feb 22, 2016 · 2380038 · 2380038
2 parents 039d4aa + 5fc5d03
commit 2380038
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/composer.json b/composer.json
@@ -17,7 +17,7 @@
         "symfony/routing": "^2.4",
         "symfony/translation": "^2.6",
         "symfony/validator": "^2.5",
-        "fsi/admin-bundle": "~1.1@dev",
+        "fsi/admin-bundle": "~2.0@dev",
         "fsi/data-indexer": "^0.9.5",
         "fsi/doctrine-extensions-bundle": "^1.1.3",
         "fsi/doctrine-extensions": "^1.1.3"
@@ -47,7 +47,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "1.1-dev"
+            "dev-master": "2.0-dev"
         }
     }
 }