Merge remote-tracking branch 'upstream/master'

ezecosystem · Apr 5, 2018 · b19a392 · b19a392
2 parents efb139d + 3195d5e
commit b19a392
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/composer.json b/composer.json
@@ -96,7 +96,7 @@
             "file": "app/config/parameters.yml"
         },
         "branch-alias": {
-            "dev-master": "2.1.x-dev"
+            "dev-master": "2.2.x-dev"
         }
     }
 }