aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/language
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2020-01-02 09:59:25 +0100
committerMarc Alexander <admin@m-a-styles.de>2020-01-02 09:59:25 +0100
commitdb5121511d09aa6f19644dfa6fe47d760c4355f9 (patch)
treec0003b620775417674c92d110ab7a145f1a7b8ca /phpBB/language
parentb9193f35c1d964e3445d3933d877be3049954411 (diff)
parent0806d34eee9a302bb8a699ee49f04b0592aa06c6 (diff)
downloadforums-db5121511d09aa6f19644dfa6fe47d760c4355f9.tar
forums-db5121511d09aa6f19644dfa6fe47d760c4355f9.tar.gz
forums-db5121511d09aa6f19644dfa6fe47d760c4355f9.tar.bz2
forums-db5121511d09aa6f19644dfa6fe47d760c4355f9.tar.xz
forums-db5121511d09aa6f19644dfa6fe47d760c4355f9.zip
Merge pull request #5802 from 3D-I/ticket/16279
[ticket/16279] Add permission for Emoji in topic title
Diffstat (limited to 'phpBB/language')
-rw-r--r--phpBB/language/en/acp/permissions_phpbb.php1
1 files changed, 1 insertions, 0 deletions
diff --git a/phpBB/language/en/acp/permissions_phpbb.php b/phpBB/language/en/acp/permissions_phpbb.php
index 2c7b3d3aee..ab8939932b 100644
--- a/phpBB/language/en/acp/permissions_phpbb.php
+++ b/phpBB/language/en/acp/permissions_phpbb.php
@@ -79,6 +79,7 @@ $lang = array_merge($lang, array(
'ACL_U_SAVEDRAFTS' => 'Can save drafts',
'ACL_U_CHGCENSORS' => 'Can disable word censors',
'ACL_U_SIG' => 'Can use signature',
+ 'ACL_U_EMOJI' => 'Can use emoji and rich text characters in topic title',
'ACL_U_SENDPM' => 'Can send private messages',
'ACL_U_MASSPM' => 'Can send private messages to multiple users',