1.1.0 preparations

- Added release date to CHANGELOG - Updated branch aliases: - dev-master => 1.1-dev - dev-develop => 1.2-dev
zendframework · Jun 13, 2016 · ca37156 · ca37156
1 parent 2377f34
commit ca37156
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,7 +2,7 @@
 
 All notable changes to this project will be documented in this file, in reverse chronological order by release.
 
-## 1.1.0 - TBD
+## 1.1.0 - 2016-06-13
 
 ### Added
 

diff --git a/composer.json b/composer.json
@@ -32,8 +32,8 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "1.0-dev",
-            "dev-develop": "1.1-dev"
+            "dev-master": "1.1-dev",
+            "dev-develop": "1.2-dev"
         },
         "zf": {
             "component": "Zend\\ServiceManager\\Di",