Merge branch 'versions/1.0.0'

weierophinney · weierophinney · commit 5883e24b0683 · 2015-12-07T10:23:04.000-06:00
Close #15
diff --git a/.travis.yml b/.travis.yml
@@ -17,7 +17,6 @@ matrix:
     - php: 7
     - php: hhvm 
   allow_failures:
-    - php: 7
     - php: hhvm
 
 before_install:
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,7 +2,9 @@
 
 All notable changes to this project will be documented in this file, in reverse chronological order by release.
 
-## 0.4.2 - TBD
+## 1.0.0 - 2015-12-07
+
+First stable release.
 
 ### Added
 
diff --git a/composer.json b/composer.json
@@ -13,7 +13,8 @@
     ],
     "extra": {
         "branch-alias": {
-            "dev-master": "1.0-dev"
+            "dev-master": "1.0-dev",
+            "dev-develop": "1.1-dev"
         }
     },
     "require": {
