release: 1.1.0 readiness

phly · Jan 24, 2019 · b2c199b · b2c199b
1 parent 5087193
commit b2c199b
Show file tree

Hide file tree

Showing 3 changed files with 4 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 - 2019-01-24
 
 ### Added
 

diff --git a/composer.json b/composer.json
@@ -43,7 +43,8 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "1.0-dev"
+            "dev-master": "1.1.x-dev",
+            "dev-develop": "1.2.x-dev"
         },
         "zf": {
             "config-provider": "Phly\\Swoole\\TaskWorker\\ConfigProvider"

diff --git a/composer.lock b/composer.lock