diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2016-09-07 21:25:17 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2016-09-07 21:25:17 +0200 |
| commit | 0aa289e4d967e6155733749307ddaefb4036dfed (patch) | |
| tree | 0f241b2723c0342ab26a07f561207fe4301069f0 /phpBB/styles | |
| parent | 051323dbc602f3a7bf06df994274f481d2cfd7d1 (diff) | |
| parent | 857a085496435e8e3a18c06505d05bd41252a568 (diff) | |
| download | forums-0aa289e4d967e6155733749307ddaefb4036dfed.tar forums-0aa289e4d967e6155733749307ddaefb4036dfed.tar.gz forums-0aa289e4d967e6155733749307ddaefb4036dfed.tar.bz2 forums-0aa289e4d967e6155733749307ddaefb4036dfed.tar.xz forums-0aa289e4d967e6155733749307ddaefb4036dfed.zip | |
Merge branch '3.1.x' into 3.2.x
Conflicts:
phpBB/styles/subsilver2/template/mcp_topic.html
Diffstat (limited to 'phpBB/styles')
| -rw-r--r-- | phpBB/styles/prosilver/template/mcp_topic.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/styles/prosilver/template/mcp_topic.html b/phpBB/styles/prosilver/template/mcp_topic.html index c3050a8891..d64c9c9a21 100644 --- a/phpBB/styles/prosilver/template/mcp_topic.html +++ b/phpBB/styles/prosilver/template/mcp_topic.html @@ -73,7 +73,7 @@ <dl> <dt><label for="to_topic_id">{L_MERGE_TOPIC_ID}{L_COLON}</label></dt> <dd> - <input class="inputbox autowidth" type="number" min="0" max="999999" name="to_topic_id" id="to_topic_id" value="{TO_TOPIC_ID}" /> + <input class="inputbox autowidth" type="number" min="0" max="9999999999" name="to_topic_id" id="to_topic_id" value="{TO_TOPIC_ID}" /> <a href="{U_SELECT_TOPIC}" >{L_SELECT_TOPIC}</a> </dd> <!-- IF TO_TOPIC_INFO --><dd>{TO_TOPIC_INFO}</dd><!-- ENDIF --> |