Merge branch 'main' into neos9

# Conflicts: # composer.json
neos · Oct 11, 2023 · b7d69e4 · b7d69e4
2 parents 0f7ad76 + f8ae38d
commit b7d69e4
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -2,9 +2,9 @@ name: Tests
 
 on:
   push:
-    branches: [ master ]
+    branches: [ main ]
   pull_request:
-    branches: [ master ]
+    branches: [ main ]
 
 jobs:
   build:

diff --git a/composer.json b/composer.json
@@ -8,7 +8,7 @@
     },
     "require": {
         "php": ">=7.4",
-        "neos/redirecthandler": "~5.0 || dev-master",
+        "neos/redirecthandler": "~5.0 || dev-main",
         "neos/neos": "~7.3 || ~8.0 || ~9.0 || dev-master",
         "ext-json": "*"
     },