Skip to content

Commit b7d69e4

Browse files
committed
Merge branch 'main' into neos9
# Conflicts: # composer.json
2 parents 0f7ad76 + f8ae38d commit b7d69e4

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

.github/workflows/tests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ name: Tests
22

33
on:
44
push:
5-
branches: [ master ]
5+
branches: [ main ]
66
pull_request:
7-
branches: [ master ]
7+
branches: [ main ]
88

99
jobs:
1010
build:

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
},
99
"require": {
1010
"php": ">=7.4",
11-
"neos/redirecthandler": "~5.0 || dev-master",
11+
"neos/redirecthandler": "~5.0 || dev-main",
1212
"neos/neos": "~7.3 || ~8.0 || ~9.0 || dev-master",
1313
"ext-json": "*"
1414
},

0 commit comments

Comments
 (0)