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/phpbb/permissions.php | |
| 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/phpbb/permissions.php')
| -rw-r--r-- | phpBB/phpbb/permissions.php | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/phpBB/phpbb/permissions.php b/phpBB/phpbb/permissions.php index 7697884b6a..236535cc6a 100644 --- a/phpBB/phpbb/permissions.php +++ b/phpBB/phpbb/permissions.php @@ -234,6 +234,7 @@ class permissions 'u_savedrafts' => array('lang' => 'ACL_U_SAVEDRAFTS', 'cat' => 'post'), 'u_chgcensors' => array('lang' => 'ACL_U_CHGCENSORS', 'cat' => 'post'), 'u_sig' => array('lang' => 'ACL_U_SIG', 'cat' => 'post'), + 'u_emoji' => array('lang' => 'ACL_U_EMOJI', 'cat' => 'post'), 'u_sendpm' => array('lang' => 'ACL_U_SENDPM', 'cat' => 'pm'), 'u_masspm' => array('lang' => 'ACL_U_MASSPM', 'cat' => 'pm'), |