Merge branch '2017.12' into 2019.03

ezsystems · May 16, 2019 · a8c72e6 · a8c72e6
2 parents 2728d92 + 1d89d06
commit a8c72e6
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/composer.json b/composer.json
@@ -83,7 +83,9 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "2019.03.x-dev"
+            "dev-2017.12": "2017.12.x-dev",
+            "dev-2019.03": "2019.03.x-dev",
+            "dev-master": "2020.99.x-dev"
         }
     }
 }