mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-09-03 05:12:37 +02:00
Code Issues Releases Wiki Activity

Merge branch '3.2.x'

Browse Source 
Conflicts:
	phpBB/composer.lock
This commit is contained in:
Marc Alexander
2016-07-14 20:23:27 +02:00
parent 96406f9b2e ebdef04f5d
commit 4e840fee16
6 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
phpBB/composer.json
View File

@@ -33,7 +33,7 @@
"marc1706/fast-image-size": "1.1.*",
"paragonie/random_compat": "^1.2",
"patchwork/utf8": "1.1.*",
"s9e/text-formatter": "^0.4.2",
"s9e/text-formatter": "^0.5.4",
"symfony/config": "2.8.*",
"symfony/console": "2.8.*",
"symfony/debug": "2.8.*",