Merge branch 'hotfix/296' into develop

Forward port #296
zendframework · May 29, 2018 · 0707218 · 0707218
2 parents 8034567 + 537453d
commit 0707218
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/composer.json b/composer.json
@@ -19,7 +19,8 @@
   "extra": {
     "branch-alias": {
       "dev-master": "1.7.x-dev",
-      "dev-develop": "1.8.x-dev"
+      "dev-develop": "1.8.x-dev",
+      "dev-release-2.0": "2.0.x-dev"
     }
   },
   "require": {

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