Merge branch '3' into 4.0

# Conflicts: # _config.php
2023-04-27 14:31:23 +12:00 · 2023-04-27 14:31:23 +12:00 · e1b4ea2807
parent c08ec451bf 5742971245
commit e1b4ea2807
2 changed files with 1 additions and 2 deletions
--- a/_config.php
+++ b/_config.php
@ -1 +0,0 @@
-<?php
--- a/composer.json
+++ b/composer.json
@ -40,4 +40,4 @@
    "license": "BSD-3-Clause",
    "minimum-stability": "dev",
    "prefer-stable": true
-}
+}