Merge branch 'composer-updates' into develop

tollmanz · May 25, 2015 · 8a6f581 · 8a6f581
2 parents 759adfc + cf6eaae
commit 8a6f581
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/composer.json b/composer.json
@@ -16,5 +16,11 @@
   },
   "require": {
     "php": ">=5.3"
+  },
+  "extra": {
+    "branch-alias": {
+      "dev-master": "1.0.x-dev",
+      "dev-develop": "2.0.x-dev"
+    }
   }
 }