Merge pull request #45 from pylebecq/master

Tom Boutell · Tom Boutell · commit b97285b220c6 · 2013-07-30T05:42:45.000-07:00
Fixed composer.json
diff --git a/composer.json b/composer.json
@@ -26,7 +26,7 @@
 	"minimum-stability": "dev",
     "extra": {
         "branch-alias": {
-            "dev-master": "master"
+            "dev-master": "1.0.x-dev"
         }
     }
-}
+}
