Updated to zend-expressive RC1

- Aliased dev-master -> 1.0-dev
zendframework · Oct 20, 2015 · 047f562 · 047f562
1 parent d04e09a
commit 047f562
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,9 +2,26 @@
 
 All notable changes to this project will be documented in this file, in reverse chronological order by release.
 
-## 0.1.2 - 2015-10-11
+## 0.2.0 - 2015-10-20
 
-Initial release.
+### Added
+
+- Nothing.
+
+### Deprecated
+
+- Nothing.
+
+### Removed
+
+- Nothing.
+
+### Fixed
+
+- Update to zend-expressive RC1.
+- Added branch alias of dev-master to 1.0-dev.
+
+## 0.1.2 - 2015-10-11
 
 ### Added
 

diff --git a/composer.json b/composer.json
@@ -11,10 +11,15 @@
         "psr-7",
         "zf2"
     ],
+    "extra": {
+        "branch-alias": {
+            "dev-master": "1.0-dev"
+        }
+    },
     "require": {
         "php": ">=5.5",
         "container-interop/container-interop": "^1.1",
-        "zendframework/zend-expressive": "^0.5",
+        "zendframework/zend-expressive": "^1.0@rc",
         "zendframework/zend-filter": "^2.5",
         "zendframework/zend-i18n": "^2.5",
         "zendframework/zend-servicemanager": "^2.5",