1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-07 17:27:16 +02:00

Merge branch '3.2.x'

This commit is contained in:
Marc Alexander
2016-08-16 20:49:36 +02:00
4 changed files with 49 additions and 5 deletions

10
phpBB/composer.lock generated
View File

@@ -622,16 +622,16 @@
},
{
"name": "s9e/text-formatter",
"version": "0.6.1",
"version": "0.6.2",
"source": {
"type": "git",
"url": "https://github.com/s9e/TextFormatter.git",
"reference": "dd0ec47d1ffb5ed5a3eb4e3adbc33db6e0057420"
"reference": "99d6b5799387dddfdd00b5a76bb83a15dda586e3"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/s9e/TextFormatter/zipball/dd0ec47d1ffb5ed5a3eb4e3adbc33db6e0057420",
"reference": "dd0ec47d1ffb5ed5a3eb4e3adbc33db6e0057420",
"url": "https://api.github.com/repos/s9e/TextFormatter/zipball/99d6b5799387dddfdd00b5a76bb83a15dda586e3",
"reference": "99d6b5799387dddfdd00b5a76bb83a15dda586e3",
"shasum": ""
},
"require": {
@@ -678,7 +678,7 @@
"parser",
"shortcodes"
],
"time": "2016-07-30 01:50:02"
"time": "2016-08-09 14:16:45"
},
{
"name": "symfony/config",