Merge branch 'master' of github.com:dynamic/silverstripe-elemental-ac…

…cordion

README.md

@@ -12,9 +12,9 @@ A block that displays content in collapsable panels.
 
 ## Requirements
 
-* dnadesign/silverstripe-elemental: ^4.8
-* dynamic/silverstripe-elemental-baseobject: ^3.0
-* symbiote/silverstripe-gridfieldextensions: ^3.1
+* dnadesign/silverstripe-elemental: ^5
+* dynamic/silverstripe-elemental-baseobject: ^4
+* symbiote/silverstripe-gridfieldextensions: ^4
 
 ## Installation
 

composer.json

@@ -18,13 +18,26 @@
         }
     ],
     "require": {
-        "dnadesign/silverstripe-elemental": "^4.8",
-        "dynamic/silverstripe-elemental-baseobject": "^3.0",
-        "symbiote/silverstripe-gridfieldextensions": "^3.1"
+        "dnadesign/silverstripe-elemental": "^5",
+        "dynamic/silverstripe-elemental-baseobject": "^4",
+        "gorriecoe/silverstripe-link": "dev-refactor/allowSS5 as 1.4.1",
+        "gorriecoe/silverstripe-linkfield": "dev-refactor/gridfieldextensions4 as 1.0.3",
+        "silverstripe/framework": "^5",
+        "symbiote/silverstripe-gridfieldextensions": "^4"
     },
     "require-dev": {
-        "silverstripe/recipe-testing": "^2"
+        "silverstripe/recipe-testing": "^3"
     },
+    "repositories": [
+        {
+            "type": "vcs",
+            "url": "[email protected]:jsirish/silverstripe-link.git"
+        },
+        {
+            "type": "vcs",
+            "url": "[email protected]:jsirish/silverstripe-linkfield.git"
+        }
+    ],
     "minimum-stability": "dev",
     "prefer-stable": true,
     "autoload": {
@@ -44,5 +57,10 @@
     "scripts": {
         "lint": "vendor/bin/phpcs src/ tests/",
         "lint-clean": "vendor/bin/phpcbf src/ tests/"
+    },
+    "extra": {
+        "branch-alias": {
+            "dev-master": "4.x-dev"
+        }
     }
 }