Merge branch 'version/bump' into develop

zfcampus · Jul 15, 2015 · 3af7ce0 · 3af7ce0
2 parents 94e105e + 3e54441
commit 3af7ce0
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/composer.json b/composer.json
@@ -21,8 +21,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": {

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