Merge branch 'hotfix/2.12.0'

jbelke · Feb 25, 2018 · 01a3fab · 01a3fab
2 parents b04da7c + 5d77f92
commit 01a3fab
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-## DreamFactory 2.11.1
+## DreamFactory 2.12.0
 
 [![License](https://poser.pugx.org/dreamfactory/dreamfactory/license.svg)](http://www.apache.org/licenses/LICENSE-2.0)
 

diff --git a/composer.json b/composer.json
@@ -90,7 +90,7 @@
   },
   "extra":             {
     "branch-alias":    {
-      "dev-develop": "2.11.x-dev"
+      "dev-develop": "2.12.x-dev"
     },
     "installer-paths": {
       "public/{$name}/": [

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