Merge pull request schmittjoh#17 from merk/patch-1

Fix branch alias
Marmelatze · Jan 9, 2013 · 7018357 · 7018357
2 parents 70ee8ed + ca365b8
commit 7018357
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/composer.json b/composer.json
@@ -19,7 +19,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "1.1.0-dev"
+            "dev-master": "1.1.x-dev"
         }
     },
     "target-dir": "JMS/AopBundle"