1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-07 01:06:48 +02:00

[ticket/11768] Re-added the code that got lost in rebase

PHPBB3-11768
This commit is contained in:
JoshyPHP
2015-02-08 13:35:07 +01:00
parent 3b115a903a
commit cfbf02bcba
4 changed files with 10 additions and 7 deletions

11
phpBB/composer.lock generated
View File

@@ -4,7 +4,7 @@
"Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically"
],
"hash": "2038bc8bd0fea66b22774ca7bca11a79",
"hash": "25df57c9c90534dcc86d31175b248719",
"packages": [
{
"name": "lusitanian/oauth",
@@ -169,12 +169,12 @@
"source": {
"type": "git",
"url": "https://github.com/s9e/TextFormatter.git",
"reference": "001dc34bccf85b75a374e2da96d363c470c798a2"
"reference": "3659ed8d9209a4a42f23f7169dbcc0a114fd601f"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/s9e/TextFormatter/zipball/001dc34bccf85b75a374e2da96d363c470c798a2",
"reference": "001dc34bccf85b75a374e2da96d363c470c798a2",
"url": "https://api.github.com/repos/s9e/TextFormatter/zipball/3659ed8d9209a4a42f23f7169dbcc0a114fd601f",
"reference": "3659ed8d9209a4a42f23f7169dbcc0a114fd601f",
"shasum": ""
},
"require": {
@@ -218,7 +218,7 @@
"parser",
"shortcodes"
],
"time": "2014-11-24 17:50:45"
"time": "2015-02-06 19:38:34"
},
{
"name": "symfony/config",
@@ -2584,6 +2584,7 @@
"aliases": [],
"minimum-stability": "stable",
"stability-flags": {
"s9e/text-formatter": 20,
"symfony/config": 20,
"symfony/console": 20,
"symfony/dependency-injection": 20,