Merge branch 'versions/1.1.0'

weierophinney · weierophinney · commit 163e684ba377 · 2016-03-23T12:26:10.000-05:00
1.1.0 readiness
diff --git a/composer.json b/composer.json
@@ -13,8 +13,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": {
