Skip to content

Commit 0a3f73d

Browse files
committed
Merge remote-tracking branch 'origin/11.2' into 11.x
2 parents 7dbd1a5 + f1fa051 commit 0a3f73d

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -130,16 +130,16 @@
130130
"umpirsky/country-list": "^2.0.6"
131131
},
132132
"conflict": {
133-
"symfony/symfony": "*",
134133
"sabre/dav": "4.2.2",
134+
"symfony/symfony": "*",
135135
"thecodingmachine/safe": "<2.0",
136136
"twig/twig": ">=3.9.0"
137137
},
138138
"require-dev": {
139139
"codeception/codeception": "^5.0.3",
140140
"codeception/module-symfony": "^3.1.0",
141141
"ergebnis/phpstan-rules": "^2.0",
142-
"phpstan/phpstan": "1.11.2",
142+
"phpstan/phpstan": "1.11.5",
143143
"phpstan/phpstan-symfony": "^1.3.5",
144144
"phpunit/phpunit": "^9.3",
145145
"gotenberg/gotenberg-php": "^1.1 || ^2.4",

tests/Support/Resources/system_settings.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
],
1010
"fallback_languages": {
1111
"en": "",
12-
"de": ""
12+
"de": "en"
1313
},
1414
"default_language": "",
1515
"debug_admin_translations": false

0 commit comments

Comments
 (0)