diff options
| author | David King <imkingdavid@gmail.com> | 2013-07-13 21:09:48 -0400 |
|---|---|---|
| committer | David King <imkingdavid@gmail.com> | 2013-07-13 21:09:48 -0400 |
| commit | e7b725369e962960943483d367f309be1cf45a69 (patch) | |
| tree | 2d287d1eb756848f5c7c961f49c9329df77aa830 /phpBB/adm | |
| parent | dfe0f6b1439ba13d433a2290a10450405428d3ef (diff) | |
| parent | 71f6f5ad7e095ded7bcad449e0bcd646ac610117 (diff) | |
| download | forums-e7b725369e962960943483d367f309be1cf45a69.tar forums-e7b725369e962960943483d367f309be1cf45a69.tar.gz forums-e7b725369e962960943483d367f309be1cf45a69.tar.bz2 forums-e7b725369e962960943483d367f309be1cf45a69.tar.xz forums-e7b725369e962960943483d367f309be1cf45a69.zip | |
Merge branch 'develop' into ticket/11215
* develop:
[ticket/11675] Fix template loop
[ticket/11690] Old module class names may get autoloaded by class_exists
[ticket/9649] Display information on index for moderators on unapproved posts
[ticket/11686] Not checking for phpBB Debug errors on functional tests
[ticket/11553] Typo
[ticket/11553] Replace bullet with unicode
[ticket/11553] Move bulletin points to pseudo class
[ticket/11600] Remove duplicate test case
[ticket/11600] Use lowercase null and remove duplicate test cases
[ticket/11600] Use local variable for $user in test_localize_errors
[ŧicket/11600] Split get driver tests into tests for all and only enabled ones
[ticket/11600] Increase code test coverage of avatar manager
Diffstat (limited to 'phpBB/adm')
| -rw-r--r-- | phpBB/adm/style/permission_roles_mask.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/adm/style/permission_roles_mask.html b/phpBB/adm/style/permission_roles_mask.html index 277310edbf..42a7fc3e4e 100644 --- a/phpBB/adm/style/permission_roles_mask.html +++ b/phpBB/adm/style/permission_roles_mask.html @@ -25,7 +25,7 @@ <a href="{role_mask.groups.U_PROFILE}">{role_mask.groups.GROUP_NAME}</a><!-- IF not role_mask.groups.S_LAST_ROW --> :: <!-- ENDIF --> <!-- BEGINELSE --> {L_GROUPS_NOT_ASSIGNED} - <!-- END users --> + <!-- END groups --> </td> </tr> </tbody> |