mirror of
https://github.com/phpbb/phpbb.git
synced 2025-05-11 01:55:24 +02:00
Merge branch '3.1.x'
This commit is contained in:
commit
3f84473306
@ -277,13 +277,14 @@ class permissions
|
|||||||
'm_approve' => array('lang' => 'ACL_M_APPROVE', 'cat' => 'post_actions'),
|
'm_approve' => array('lang' => 'ACL_M_APPROVE', 'cat' => 'post_actions'),
|
||||||
'm_report' => array('lang' => 'ACL_M_REPORT', 'cat' => 'post_actions'),
|
'm_report' => array('lang' => 'ACL_M_REPORT', 'cat' => 'post_actions'),
|
||||||
'm_chgposter' => array('lang' => 'ACL_M_CHGPOSTER', 'cat' => 'post_actions'),
|
'm_chgposter' => array('lang' => 'ACL_M_CHGPOSTER', 'cat' => 'post_actions'),
|
||||||
|
'm_info' => array('lang' => 'ACL_M_INFO', 'cat' => 'post_actions'),
|
||||||
|
'm_softdelete' => array('lang' => 'ACL_M_SOFTDELETE', 'cat' => 'post_actions'),
|
||||||
|
|
||||||
'm_move' => array('lang' => 'ACL_M_MOVE', 'cat' => 'topic_actions'),
|
'm_move' => array('lang' => 'ACL_M_MOVE', 'cat' => 'topic_actions'),
|
||||||
'm_lock' => array('lang' => 'ACL_M_LOCK', 'cat' => 'topic_actions'),
|
'm_lock' => array('lang' => 'ACL_M_LOCK', 'cat' => 'topic_actions'),
|
||||||
'm_split' => array('lang' => 'ACL_M_SPLIT', 'cat' => 'topic_actions'),
|
'm_split' => array('lang' => 'ACL_M_SPLIT', 'cat' => 'topic_actions'),
|
||||||
'm_merge' => array('lang' => 'ACL_M_MERGE', 'cat' => 'topic_actions'),
|
'm_merge' => array('lang' => 'ACL_M_MERGE', 'cat' => 'topic_actions'),
|
||||||
|
|
||||||
'm_info' => array('lang' => 'ACL_M_INFO', 'cat' => 'misc'),
|
|
||||||
'm_warn' => array('lang' => 'ACL_M_WARN', 'cat' => 'misc'),
|
'm_warn' => array('lang' => 'ACL_M_WARN', 'cat' => 'misc'),
|
||||||
'm_ban' => array('lang' => 'ACL_M_BAN', 'cat' => 'misc'),
|
'm_ban' => array('lang' => 'ACL_M_BAN', 'cat' => 'misc'),
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user