Skip to content

Commit 2502575

Browse files
authored
Merge branch 'phpbb:3.3.x' into 3.3.x
2 parents e4796a4 + d502870 commit 2502575

File tree

4 files changed

+312
-265
lines changed

4 files changed

+312
-265
lines changed

composer.json

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,9 +61,9 @@
6161
}
6262
],
6363
"require": {
64-
"php": "^7.1.3",
64+
"php": "^7.4.33",
6565
"phpbb/epv": "dev-master@dev",
66-
"phpbb/translation-validator": "~1.5",
66+
"phpbb/translation-validator": "~1.6",
6767
"composer/installers": "~1.0",
6868
"battye/php-array-parser": "~1.0",
6969
"chumper/zipper": "1.0.0"
@@ -73,5 +73,14 @@
7373
"soft-require": {
7474
"phpbb/phpbb": "3.3.*@dev"
7575
}
76+
},
77+
"config": {
78+
"platform": {
79+
"php": "7.4.33"
80+
},
81+
"allow-plugins": {
82+
"kylekatarnls/update-helper": true,
83+
"composer/installers": true
84+
}
7685
}
7786
}

0 commit comments

Comments
 (0)