diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2013-11-26 11:33:17 +0100 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2013-11-26 11:33:17 +0100 |
| commit | c49e7387d69b23e07c4ba9f35ffebce78a2cb09c (patch) | |
| tree | f8646742a788d342b31335288395921c3f53ac2d /phpBB/adm/style | |
| parent | 0d0b2627f723c3003af0ea301511a972008e7734 (diff) | |
| parent | afb4585dd904de6f5ce4be2607cc90d0cb9def09 (diff) | |
| download | forums-c49e7387d69b23e07c4ba9f35ffebce78a2cb09c.tar forums-c49e7387d69b23e07c4ba9f35ffebce78a2cb09c.tar.gz forums-c49e7387d69b23e07c4ba9f35ffebce78a2cb09c.tar.bz2 forums-c49e7387d69b23e07c4ba9f35ffebce78a2cb09c.tar.xz forums-c49e7387d69b23e07c4ba9f35ffebce78a2cb09c.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/12037] Fix hard-coded text in acp_inactive.html.
Conflicts:
phpBB/adm/style/acp_inactive.html
Diffstat (limited to 'phpBB/adm/style')
| -rw-r--r-- | phpBB/adm/style/acp_inactive.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/adm/style/acp_inactive.html b/phpBB/adm/style/acp_inactive.html index 0302007861..1c42c93f76 100644 --- a/phpBB/adm/style/acp_inactive.html +++ b/phpBB/adm/style/acp_inactive.html @@ -53,7 +53,7 @@ </table> <fieldset class="display-options"> - {L_DISPLAY_LOG}{L_COLON} {S_LIMIT_DAYS} {L_SORT_BY}{L_COLON} {S_SORT_KEY} {S_SORT_DIR}<!-- IF .pagination --> Users per page{L_COLON} <input class="inputbox autowidth" type="number" name="users_per_page" id="users_per_page" size="3" value="{USERS_PER_PAGE}" /><!-- ENDIF --> + {L_DISPLAY_LOG}{L_COLON} {S_LIMIT_DAYS} {L_SORT_BY}{L_COLON} {S_SORT_KEY} {S_SORT_DIR}<!-- IF .pagination --> {L_USERS_PER_PAGE}{L_COLON} <input class="inputbox autowidth" type="number" name="users_per_page" id="users_per_page" size="3" value="{USERS_PER_PAGE}" /><!-- ENDIF --> <input class="button2" type="submit" value="{L_GO}" name="sort" /> </fieldset> |