Merge remote-tracking branch 'upstream/master'

ezecosystem · Aug 8, 2017 · 38c0d53 · 38c0d53
2 parents 02e758a + f98cebb
commit 38c0d53
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/composer.json b/composer.json
@@ -103,7 +103,7 @@
             "file": "app/config/parameters.yml"
         },
         "branch-alias": {
-            "dev-master": "1.11.x-dev"
+            "dev-master": "1.12.x-dev"
         }
     },
     "bin": [