Merge branch 'version/bump' into develop

weierophinney · weierophinney · commit ba209e651570 · 2015-07-15T11:05:11.000-05:00
diff --git a/composer.json b/composer.json
@@ -22,8 +22,8 @@
     ],
     "extra": {
         "branch-alias": {
-            "dev-master": "1.0-dev",
-            "dev-develop": "1.1-dev"
+            "dev-master": "1.1-dev",
+            "dev-develop": "1.2-dev"
         }
     },
     "require": {
