aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/develop/add_permissions.php
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2020-01-02 10:13:04 +0100
committerMarc Alexander <admin@m-a-styles.de>2020-01-02 10:13:04 +0100
commitfcca5c5b582c43353be73ae50afb631e51407bbf (patch)
treea618be08f4bdbba9cefe9d29b3007cba3d53d979 /phpBB/develop/add_permissions.php
parentbf58fafd76d26a9b98c3b800019b07599886ae3b (diff)
parent36c370947ccfed9b687da7add3a81219e1ae9c7c (diff)
downloadforums-fcca5c5b582c43353be73ae50afb631e51407bbf.tar
forums-fcca5c5b582c43353be73ae50afb631e51407bbf.tar.gz
forums-fcca5c5b582c43353be73ae50afb631e51407bbf.tar.bz2
forums-fcca5c5b582c43353be73ae50afb631e51407bbf.tar.xz
forums-fcca5c5b582c43353be73ae50afb631e51407bbf.zip
Merge branch 'prep-release-3.2.9' into 3.2.x
Diffstat (limited to 'phpBB/develop/add_permissions.php')
-rw-r--r--phpBB/develop/add_permissions.php1
1 files changed, 1 insertions, 0 deletions
diff --git a/phpBB/develop/add_permissions.php b/phpBB/develop/add_permissions.php
index d7308a1acc..ee5e116d91 100644
--- a/phpBB/develop/add_permissions.php
+++ b/phpBB/develop/add_permissions.php
@@ -156,6 +156,7 @@ $u_permissions = array(
'u_download' => array(0, 1),
'u_attach' => array(0, 1),
'u_sig' => array(0, 1),
+ 'u_emoji' => array(0, 1),
'u_pm_attach' => array(0, 1),
'u_pm_bbcode' => array(0, 1),
'u_pm_smilies' => array(0, 1),