Merge branch '1.12.x' into 2.2.x

# Conflicts: # composer.json
doctrine · Nov 7, 2020 · 2aacd83 · 2aacd83
2 parents c1b1fe9 + 5226200
commit 2aacd83
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/composer.json b/composer.json
@@ -70,7 +70,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "2.2.x-dev"
+            "dev-master": "2.3.x-dev"
         }
     }
 }