diff options
| author | Adrian Lang <mail@adrianlang.de> | 2011-05-08 20:55:40 +0200 |
|---|---|---|
| committer | Adrian Lang <mail@adrianlang.de> | 2011-05-08 20:55:40 +0200 |
| commit | 9199737c351d653a1d384cb50ed0d185f6512826 (patch) | |
| tree | 2da4dbc0b92a72c767712549b6d90f53b0a3605e /lib/plugins/acl/lang/es/lang.php | |
| parent | e68653d8ef3df043761e4042c563d65731f9b9c6 (diff) | |
| parent | 2b537ba8dc1863d603770c208ae4f91d4d0877b9 (diff) | |
| download | rpg-9199737c351d653a1d384cb50ed0d185f6512826.tar.gz rpg-9199737c351d653a1d384cb50ed0d185f6512826.tar.bz2 | |
Merge branch 'master' into stable
Conflicts:
doku.php
Diffstat (limited to 'lib/plugins/acl/lang/es/lang.php')
| -rw-r--r-- | lib/plugins/acl/lang/es/lang.php | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/plugins/acl/lang/es/lang.php b/lib/plugins/acl/lang/es/lang.php index e63448a00..096320af9 100644 --- a/lib/plugins/acl/lang/es/lang.php +++ b/lib/plugins/acl/lang/es/lang.php @@ -19,6 +19,7 @@ * @author Fernando J. Gómez <fjgomez@gmail.com> * @author Victor Castelan <victorcastelan@gmail.com> * @author Mauro Javier Giamberardino <mgiamberardino@gmail.com> + * @author emezeta <emezeta@infoprimo.com> */ $lang['admin_acl'] = 'Administración de lista de control de acceso'; $lang['acl_group'] = 'Grupo'; |