Merge branch '2.2' into 2

2024-10-22 11:05:51 +02:00 · 2021-12-22 10:28:46 +13:00 · 2021-12-22 10:28:46 +13:00 · 4e6fbe17aa
commit 4e6fbe17aa
parent c2c0221ddc 25e13114d2
1 changed files with 5 additions and 6 deletions
--- a/composer.json
+++ b/composer.json
@ -2,7 +2,9 @@
    "name": "silverstripe/iframe",
    "description": "Add an iFrame pagetype to SilverStripe, to show content from another website",
    "type": "silverstripe-vendormodule",
-    "keywords": ["silverstripe"],
+    "keywords": [
+        "silverstripe"
+    ],
    "license": "BSD-3-Clause",
    "authors": [
        {
@ -27,11 +29,8 @@
    "extra": {
        "expose": [
            "javascript"
-        ],
-        "branch-alias": {
-            "dev-master": "2.x-dev"
-        }
+        ]
    },
    "minimum-stability": "dev",
    "prefer-stable": true
-}
+}