Update after merge conflicts.

This commit is contained in:
Matej Bačo
2022-08-31 13:35:42 +00:00
parent a85a471d3b
commit 2e00fd5d4f
6 changed files with 6 additions and 6 deletions
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
Generated
+1 -1
View File
@@ -5386,5 +5386,5 @@
"platform-overrides": {
"php": "8.0"
},
"plugin-api-version": "2.3.0"
"plugin-api-version": "2.2.0"
}