aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2019-06-17 14:53:56 +0200
committerMarc Alexander <admin@m-a-styles.de>2019-06-17 14:53:56 +0200
commit8a979d6871a19bd39d5f85ceaad787314d1eaaa7 (patch)
treed70918b1fb4d8c8b01a1c33575b998d42e86d43b /phpBB
parent30f522351edfbf2c34b6456001cd9575a2e734ef (diff)
parenta393a23a087797531eee6ae998ec2698a89b4fd7 (diff)
downloadforums-8a979d6871a19bd39d5f85ceaad787314d1eaaa7.tar
forums-8a979d6871a19bd39d5f85ceaad787314d1eaaa7.tar.gz
forums-8a979d6871a19bd39d5f85ceaad787314d1eaaa7.tar.bz2
forums-8a979d6871a19bd39d5f85ceaad787314d1eaaa7.tar.xz
forums-8a979d6871a19bd39d5f85ceaad787314d1eaaa7.zip
Merge branch '3.2.x' into 3.3.x
Diffstat (limited to 'phpBB')
-rw-r--r--phpBB/composer.lock12
1 files changed, 6 insertions, 6 deletions
diff --git a/phpBB/composer.lock b/phpBB/composer.lock
index b0d579132d..24f1d7d8e7 100644
--- a/phpBB/composer.lock
+++ b/phpBB/composer.lock
@@ -837,16 +837,16 @@
},
{
"name": "s9e/text-formatter",
- "version": "2.0.0",
+ "version": "2.0.1",
"source": {
"type": "git",
"url": "https://github.com/s9e/TextFormatter.git",
- "reference": "f15541ce19e9af7eeb48b8b91b3ee93bec5f2f9b"
+ "reference": "9bd8b56ebbb9a93eb99c05141e31fded4149de0e"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/s9e/TextFormatter/zipball/f15541ce19e9af7eeb48b8b91b3ee93bec5f2f9b",
- "reference": "f15541ce19e9af7eeb48b8b91b3ee93bec5f2f9b",
+ "url": "https://api.github.com/repos/s9e/TextFormatter/zipball/9bd8b56ebbb9a93eb99c05141e31fded4149de0e",
+ "reference": "9bd8b56ebbb9a93eb99c05141e31fded4149de0e",
"shasum": ""
},
"require": {
@@ -871,7 +871,7 @@
},
"type": "library",
"extra": {
- "version": "2.0.0"
+ "version": "2.0.1"
},
"autoload": {
"psr-4": {
@@ -901,7 +901,7 @@
"parser",
"shortcodes"
],
- "time": "2019-05-31T17:56:58+00:00"
+ "time": "2019-06-06T13:44:40+00:00"
},
{
"name": "symfony/config",