Merge branch '3.3.x'

This commit is contained in:
Marc Alexander 2019-06-17 14:54:53 +02:00
commit 48aed593fe
3 changed files with 8 additions and 6 deletions

12
phpBB/composer.lock generated
View file

@ -1325,16 +1325,16 @@
}, },
{ {
"name": "s9e/text-formatter", "name": "s9e/text-formatter",
"version": "2.0.0", "version": "2.0.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/s9e/TextFormatter.git", "url": "https://github.com/s9e/TextFormatter.git",
"reference": "f15541ce19e9af7eeb48b8b91b3ee93bec5f2f9b" "reference": "9bd8b56ebbb9a93eb99c05141e31fded4149de0e"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/s9e/TextFormatter/zipball/f15541ce19e9af7eeb48b8b91b3ee93bec5f2f9b", "url": "https://api.github.com/repos/s9e/TextFormatter/zipball/9bd8b56ebbb9a93eb99c05141e31fded4149de0e",
"reference": "f15541ce19e9af7eeb48b8b91b3ee93bec5f2f9b", "reference": "9bd8b56ebbb9a93eb99c05141e31fded4149de0e",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -1359,7 +1359,7 @@
}, },
"type": "library", "type": "library",
"extra": { "extra": {
"version": "2.0.0" "version": "2.0.1"
}, },
"autoload": { "autoload": {
"psr-4": { "psr-4": {
@ -1389,7 +1389,7 @@
"parser", "parser",
"shortcodes" "shortcodes"
], ],
"time": "2019-05-31T17:56:58+00:00" "time": "2019-06-06T13:44:40+00:00"
}, },
{ {
"name": "seld/jsonlint", "name": "seld/jsonlint",

View file

@ -0,0 +1 @@
<img alt=":man_judge:" class="emoji smilies" draggable="false" src="//twemoji.maxcdn.com/2/svg/1f468-200d-2696-fe0f.svg"> <img alt="👨‍⚖️" class="emoji smilies" draggable="false" src="//twemoji.maxcdn.com/2/svg/1f468-200d-2696-fe0f.svg">

View file

@ -0,0 +1 @@
:man_judge: 👨‍⚖️