diff options
author | Andreas Gohr <andi@splitbrain.org> | 2010-11-07 17:38:39 +0100 |
---|---|---|
committer | Andreas Gohr <andi@splitbrain.org> | 2010-11-07 17:38:39 +0100 |
commit | 7a94cade57d6c4514101c374d895ed278c05bbb1 (patch) | |
tree | 774de9d9c7c47a9e43c5ad6560bdea1a6bb94a7f /lib/plugins/acl | |
parent | 0ae96b5697f1f1fe192e5eade99490c475467b84 (diff) | |
parent | eb97dcb864e05302756dcec4320c3c41866e4217 (diff) | |
download | rpg-7a94cade57d6c4514101c374d895ed278c05bbb1.tar.gz rpg-7a94cade57d6c4514101c374d895ed278c05bbb1.tar.bz2 |
Merge branch 'master' into stable
Diffstat (limited to 'lib/plugins/acl')
-rw-r--r-- | lib/plugins/acl/lang/zh/lang.php | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/plugins/acl/lang/zh/lang.php b/lib/plugins/acl/lang/zh/lang.php index e806ad434..d79a78089 100644 --- a/lib/plugins/acl/lang/zh/lang.php +++ b/lib/plugins/acl/lang/zh/lang.php @@ -10,6 +10,7 @@ * @author mr.jinyi@gmail.com * @author ben <ben@livetom.com> * @author lainme <lainme993@gmail.com> + * @author caii <zhoucaiqi@gmail.com> */ $lang['admin_acl'] = '访问控制列表(ACL)管理器'; $lang['acl_group'] = '组'; |