Merge branch 'versions/1.3.0'

1.3.0 readiness
zendframework · Dec 15, 2015 · 08284cf · 08284cf
2 parents 635b40b + 4855427
commit 08284cf
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.3.0 - TBD
+## 1.3.0 - 2015-12-15
 
 ### Added
 

diff --git a/composer.json b/composer.json
@@ -15,8 +15,8 @@
   },
   "extra": {
     "branch-alias": {
-      "dev-master": "1.2-dev",
-      "dev-develop": "1.3-dev"
+      "dev-master": "1.3-dev",
+      "dev-develop": "1.4-dev"
     }
   },
   "require": {