1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-11 11:13:59 +02:00

Merge branch '3.2.x'

This commit is contained in:
Marc Alexander
2017-12-27 18:16:29 +01:00
14 changed files with 46 additions and 47 deletions

18
phpBB/composer.lock generated
View File

@@ -4,8 +4,8 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically"
],
"hash": "9261bee54d8a45fece3e7c83db74e1e0",
"content-hash": "725640e42155cd1f599ef3cc504ee22f",
"hash": "8e1c75ec0aaf938fb328165209dbb9e2",
"content-hash": "aa8d6a47717887456a0066a1320811e0",
"packages": [
{
"name": "bantu/ini-get-wrapper",
@@ -1143,27 +1143,27 @@
},
{
"name": "s9e/text-formatter",
"version": "0.11.2",
"version": "0.13.1",
"source": {
"type": "git",
"url": "https://github.com/s9e/TextFormatter.git",
"reference": "735a56076e29348d838ce6c2658996daae86718f"
"reference": "804ed8fdfa9fd0c8d99f5a33000d4f7e5ed90c6f"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/s9e/TextFormatter/zipball/735a56076e29348d838ce6c2658996daae86718f",
"reference": "735a56076e29348d838ce6c2658996daae86718f",
"url": "https://api.github.com/repos/s9e/TextFormatter/zipball/804ed8fdfa9fd0c8d99f5a33000d4f7e5ed90c6f",
"reference": "804ed8fdfa9fd0c8d99f5a33000d4f7e5ed90c6f",
"shasum": ""
},
"require": {
"ext-dom": "*",
"ext-filter": "*",
"lib-pcre": ">=7.2",
"php": ">=5.3.3"
"php": ">=5.4.7"
},
"require-dev": {
"matthiasmullie/minify": "*",
"php": ">=5.3.3",
"php": ">=5.4.7",
"s9e/regexp-builder": ">=1.3.0"
},
"suggest": {
@@ -1204,7 +1204,7 @@
"parser",
"shortcodes"
],
"time": "2017-10-02 16:58:51"
"time": "2017-12-10 00:55:53"
},
{
"name": "seld/cli-prompt",