diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2020-01-02 10:02:17 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2020-01-02 10:02:17 +0100 |
| commit | 36c370947ccfed9b687da7add3a81219e1ae9c7c (patch) | |
| tree | 3963e2fc1ec4071e934cecd92f701629a9debe1f /phpBB/language | |
| parent | 693d008851f5871cf073ac6997c12c7c71ea8cb6 (diff) | |
| parent | fa099867a8bd2442019822077b09ab7d3569da7a (diff) | |
| download | forums-36c370947ccfed9b687da7add3a81219e1ae9c7c.tar forums-36c370947ccfed9b687da7add3a81219e1ae9c7c.tar.gz forums-36c370947ccfed9b687da7add3a81219e1ae9c7c.tar.bz2 forums-36c370947ccfed9b687da7add3a81219e1ae9c7c.tar.xz forums-36c370947ccfed9b687da7add3a81219e1ae9c7c.zip | |
Merge branch 'ticket/16279' into prep-release-3.2.9
Diffstat (limited to 'phpBB/language')
| -rw-r--r-- | phpBB/language/en/acp/permissions_phpbb.php | 1 |
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', |