Merge 6450141 into 914770b

mnapoli · Feb 14, 2015 · 64d9095 · 64d9095
2 parents 914770b + 6450141
commit 64d9095
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/composer.json b/composer.json
@@ -21,5 +21,10 @@
     },
     "require-dev": {
         "phpunit/phpunit": "~4.5"
+    },
+    "extra": {
+        "branch-alias": {
+            "dev-master": "0.2.x-dev"
+        }
     }
 }