diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2015-10-11 10:48:53 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2015-10-11 10:48:53 +0200 |
| commit | 8c3fdfe4e12a2ea8c485f30a223fe344cb04ef9d (patch) | |
| tree | 509de1d16752d04171d7fe275a2788976c509c46 /phpBB/phpbb/permissions.php | |
| parent | f6f796770a0964589669d97a1c4d79569b900de8 (diff) | |
| parent | f6c8338358e5216a62c37bc8ccf252d0e5c6fe0f (diff) | |
| download | forums-8c3fdfe4e12a2ea8c485f30a223fe344cb04ef9d.tar forums-8c3fdfe4e12a2ea8c485f30a223fe344cb04ef9d.tar.gz forums-8c3fdfe4e12a2ea8c485f30a223fe344cb04ef9d.tar.bz2 forums-8c3fdfe4e12a2ea8c485f30a223fe344cb04ef9d.tar.xz forums-8c3fdfe4e12a2ea8c485f30a223fe344cb04ef9d.zip | |
Merge branch '3.1.x'
Diffstat (limited to 'phpBB/phpbb/permissions.php')
| -rw-r--r-- | phpBB/phpbb/permissions.php | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/phpBB/phpbb/permissions.php b/phpBB/phpbb/permissions.php index 0c6fad295c..c9181e6202 100644 --- a/phpBB/phpbb/permissions.php +++ b/phpBB/phpbb/permissions.php @@ -308,8 +308,9 @@ class permissions 'm_split' => array('lang' => 'ACL_M_SPLIT', 'cat' => 'topic_actions'), 'm_merge' => array('lang' => 'ACL_M_MERGE', 'cat' => 'topic_actions'), - 'm_warn' => array('lang' => 'ACL_M_WARN', 'cat' => 'misc'), - 'm_ban' => array('lang' => 'ACL_M_BAN', 'cat' => 'misc'), + 'm_warn' => array('lang' => 'ACL_M_WARN', 'cat' => 'misc'), + 'm_pm_report' => array('lang' => 'ACL_M_PM_REPORT', 'cat' => 'misc'), + 'm_ban' => array('lang' => 'ACL_M_BAN', 'cat' => 'misc'), // Admin Permissions 'a_board' => array('lang' => 'ACL_A_BOARD', 'cat' => 'settings'), |