mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-30 21:40:43 +02:00
Code Issues Releases Wiki Activity

Merge branch '3.2.x'

Browse Source
This commit is contained in:
Máté Bartus
2016-11-02 10:02:09 +01:00
parent 890fe72e48 094ac6b60f
commit 65d09b1dce
4 changed files with 35 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
phpBB/composer.lock generated
View File

@@ -640,16 +640,16 @@
},
{
"name": "s9e/text-formatter",
"version": "0.8.1",
"version": "0.8.3",
"source": {
"type": "git",
"url": "https://github.com/s9e/TextFormatter.git",
"reference": "93f0bc0a1ad829b90b5482c3d2bfc35ee4cfaacf"
"reference": "34668fccbe259fbca0331e7a34409c4502ee71bd"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/s9e/TextFormatter/zipball/93f0bc0a1ad829b90b5482c3d2bfc35ee4cfaacf",
"reference": "93f0bc0a1ad829b90b5482c3d2bfc35ee4cfaacf",
"url": "https://api.github.com/repos/s9e/TextFormatter/zipball/34668fccbe259fbca0331e7a34409c4502ee71bd",
"reference": "34668fccbe259fbca0331e7a34409c4502ee71bd",
"shasum": ""
},
"require": {
@@ -696,7 +696,7 @@
"parser",
"shortcodes"
],
"time": "2016-10-09 23:40:32"
"time": "2016-11-02 08:14:58"
},
{
"name": "symfony/config",