Merge branch '3' into 4.0

# Conflicts: # _config.php
silverstripe · Apr 27, 2023 · e1b4ea2 · e1b4ea2
2 parents c08ec45 + 5742971
commit e1b4ea2
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/_config.php b/_config.php
diff --git a/composer.json b/composer.json
@@ -40,4 +40,4 @@
     "license": "BSD-3-Clause",
     "minimum-stability": "dev",
     "prefer-stable": true
-}
+}