diff options
| author | Nils Adermann <naderman@naderman.de> | 2014-03-05 11:51:38 +0100 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2014-03-05 11:51:38 +0100 |
| commit | 71354ef185e003319cdc9031928054fdb2f0b970 (patch) | |
| tree | df276829a7f3a73a70d9895a54442cb113f68f0e /phpBB/adm/style | |
| parent | 0e35a8515598b6cdf38c2b98ecde9e8cc984e594 (diff) | |
| download | forums-71354ef185e003319cdc9031928054fdb2f0b970.tar forums-71354ef185e003319cdc9031928054fdb2f0b970.tar.gz forums-71354ef185e003319cdc9031928054fdb2f0b970.tar.bz2 forums-71354ef185e003319cdc9031928054fdb2f0b970.tar.xz forums-71354ef185e003319cdc9031928054fdb2f0b970.zip | |
[develop] Fix incorrect merge conflict resolution from PR #2085
PHPBB3-12235
Diffstat (limited to 'phpBB/adm/style')
| -rw-r--r-- | phpBB/adm/style/acp_prune_users.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/adm/style/acp_prune_users.html b/phpBB/adm/style/acp_prune_users.html index 8a93448fae..b8c271355b 100644 --- a/phpBB/adm/style/acp_prune_users.html +++ b/phpBB/adm/style/acp_prune_users.html @@ -19,7 +19,7 @@ <dd><input type="text" id="email" name="email" /></dd> </dl> <dl> - <dt><label for="joined">{L_JOINED}{L_COLON}</label><br /><span>{L_JOINED_EXPLAIN}</span></dt> + <dt><label for="joined_after">{L_JOINED}{L_COLON}</label><br /><span>{L_JOINED_EXPLAIN}</span></dt> <dd> <strong>{L_AFTER}</strong> <input type="text" id="joined_after" name="joined_after" /> <br /> <br /> <strong>{L_BEFORE}</strong> <input type="text" id="joined_before" name="joined_before" /> |