Merge branch '1.2' into 1

silverstripe · May 21, 2021 · 45ad17a · 45ad17a
2 parents 2323e7b + 384e456
commit 45ad17a
Showing 1 changed file with 2 additions and 6 deletions.
diff --git a/composer.json b/composer.json
@@ -14,11 +14,7 @@
         "sminnee/phpunit": "^5.7",
         "squizlabs/php_codesniffer": "^3"
     },
-    "extra": {
-        "branch-alias": {
-            "dev-master": "1.x-dev"
-        }
-    },
+    "extra": [],
     "autoload": {
         "psr-4": {
             "CWP\\PDFExport\\": "src/",
@@ -27,4 +23,4 @@
     },
     "minimum-stability": "dev",
     "prefer-stable": true
-}
+}