Merge branch '3.2.x'

This commit is contained in:
Marc Alexander 2017-01-22 23:00:12 +01:00
commit defcb1c46f
No known key found for this signature in database
GPG key ID: 50E0D2423696F995

10
phpBB/composer.lock generated
View file

@ -640,16 +640,16 @@
}, },
{ {
"name": "s9e/text-formatter", "name": "s9e/text-formatter",
"version": "0.9.0", "version": "0.9.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/s9e/TextFormatter.git", "url": "https://github.com/s9e/TextFormatter.git",
"reference": "9dc4227779f8a753dbf0c4f8cb129320522d325c" "reference": "e0f1d477d5c24dff11fa3aaa408d8ead07006fe3"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/s9e/TextFormatter/zipball/9dc4227779f8a753dbf0c4f8cb129320522d325c", "url": "https://api.github.com/repos/s9e/TextFormatter/zipball/e0f1d477d5c24dff11fa3aaa408d8ead07006fe3",
"reference": "9dc4227779f8a753dbf0c4f8cb129320522d325c", "reference": "e0f1d477d5c24dff11fa3aaa408d8ead07006fe3",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -701,7 +701,7 @@
"parser", "parser",
"shortcodes" "shortcodes"
], ],
"time": "2017-01-15 10:15:45" "time": "2017-01-22 17:12:21"
}, },
{ {
"name": "symfony/config", "name": "symfony/config",