Merge remote-tracking branch 'origin/master'

Violet88github · Oct 31, 2023 · 8c35216 · 8c35216
2 parents 7c6f980 + e320305
commit 8c35216
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/SECURITY.md b/SECURITY.md
@@ -5,6 +5,8 @@
 | Version | Supported          |
 | ------- | ------------------ |
 | 1.0     | :white_check_mark: |
+| 1.0.1   | :white_check_mark: |
+| 1.0.2   | :white_check_mark: |
 
 ## Reporting a Vulnerability
 To report a security vulnerability, please contact Sven van der Zwet directly. You can send an email to s.vanderzwet@student.avans.nl.

diff --git a/composer.json b/composer.json
@@ -11,11 +11,11 @@
     "license": "BSD-3-Clause",
     "require": {
         "php": "^7.4 || ^8.0",
-        "silverstripe/framework": "^4.0",
-        "silverstripe/admin": "^1.0",
+        "silverstripe/framework": "^4.0 || ^5.0",
+        "silverstripe/admin": "^1.0 || ^2.0",
         "bugsnag/bugsnag": "^3.0",
         "guzzlehttp/guzzle": "^7.0",
-        "silverstripe/recipe-cms": "^4.11"
+        "silverstripe/recipe-cms": "^4.11 || ^5.0"
     },
     "require-dev": {
         "phpunit/phpunit": "^9.5.24",