diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2016-01-08 16:39:33 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2016-01-08 16:39:33 +0100 |
| commit | 0028ed3e956f2d8e418e0cd26be34cff133ef672 (patch) | |
| tree | e16b30e9bca56e17dbd5ab5a59bae5f6636086a1 /phpBB/styles | |
| parent | b6fee9f536f01d85ae8233dd5259992ce6c6e143 (diff) | |
| parent | 2ab7b124193ab87eeca8eef5d0e50eebd37d3336 (diff) | |
| download | forums-0028ed3e956f2d8e418e0cd26be34cff133ef672.tar forums-0028ed3e956f2d8e418e0cd26be34cff133ef672.tar.gz forums-0028ed3e956f2d8e418e0cd26be34cff133ef672.tar.bz2 forums-0028ed3e956f2d8e418e0cd26be34cff133ef672.tar.xz forums-0028ed3e956f2d8e418e0cd26be34cff133ef672.zip | |
Merge branch '3.1.x'
Conflicts:
phpBB/styles/subsilver2/template/ucp_prefs_personal.html
Diffstat (limited to 'phpBB/styles')
| -rw-r--r-- | phpBB/styles/prosilver/template/ucp_prefs_personal.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/styles/prosilver/template/ucp_prefs_personal.html b/phpBB/styles/prosilver/template/ucp_prefs_personal.html index c8b028f83a..4cd9f6655b 100644 --- a/phpBB/styles/prosilver/template/ucp_prefs_personal.html +++ b/phpBB/styles/prosilver/template/ucp_prefs_personal.html @@ -70,7 +70,7 @@ {S_DATEFORMAT_OPTIONS} </select> </dd> - <dd id="custom_date" style="display:none;"><input type="text" name="dateformat" id="dateformat" value="{DATE_FORMAT}" maxlength="30" class="inputbox narrow" style="margin-top: 3px;" /></dd> + <dd id="custom_date" style="display:none;"><input type="text" name="dateformat" id="dateformat" value="{DATE_FORMAT}" maxlength="64" class="inputbox narrow" style="margin-top: 3px;" /></dd> </dl> <!-- EVENT ucp_prefs_personal_append --> </fieldset> |