Merge branch 'releases/1.0.0'

weierophinney · weierophinney · commit b3c0ef846e7c · 2014-05-06T14:49:51.000-05:00
1.0.0 readiness
diff --git a/composer.json b/composer.json
@@ -23,6 +23,9 @@
     "extra": {
         "branch-alias": {
             "dev-master": "1.0-dev"
+        },
+        "branch-alias": {
+            "dev-develop": "1.1-dev"
         }
     },
     "require": {
