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

Merge pull request #5616 from JoshyPHP/ticket/16074

[ticket/16074] Fix Twemoji URL for ZWJ sequences
This commit is contained in:
Marc Alexander
2019-06-17 13:54:38 +02:00
3 changed files with 7 additions and 5 deletions

10
phpBB/composer.lock generated
View File

@@ -661,16 +661,16 @@
}, },
{ {
"name": "s9e/text-formatter", "name": "s9e/text-formatter",
"version": "1.4.4", "version": "1.4.5",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/s9e/TextFormatter.git", "url": "https://github.com/s9e/TextFormatter.git",
"reference": "504d538593350150e50c9de0a48418bb0a48e540" "reference": "6857c53658929b66dc0d92daece17f211c64ea61"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/s9e/TextFormatter/zipball/504d538593350150e50c9de0a48418bb0a48e540", "url": "https://api.github.com/repos/s9e/TextFormatter/zipball/6857c53658929b66dc0d92daece17f211c64ea61",
"reference": "504d538593350150e50c9de0a48418bb0a48e540", "reference": "6857c53658929b66dc0d92daece17f211c64ea61",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@@ -723,7 +723,7 @@
"parser", "parser",
"shortcodes" "shortcodes"
], ],
"time": "2019-05-15T00:08:12+00:00" "time": "2019-06-04T15:47:55+00:00"
}, },
{ {
"name": "symfony/config", "name": "symfony/config",

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: 👨‍⚖️