diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2010-11-06 18:56:01 +0100 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2010-11-06 18:56:01 +0100 |
| commit | b60892d200247b4d608806f2172f681001cfa64b (patch) | |
| tree | 7b673d1e7e0d7e37cb955c901a71aeecdb7a9ec6 /phpBB/adm | |
| parent | f164906d77d3c8cb5650bb1e70db8e233f726d4c (diff) | |
| parent | 516282dfa9f07bc0534f260462eceabc5531d33b (diff) | |
| download | forums-b60892d200247b4d608806f2172f681001cfa64b.tar forums-b60892d200247b4d608806f2172f681001cfa64b.tar.gz forums-b60892d200247b4d608806f2172f681001cfa64b.tar.bz2 forums-b60892d200247b4d608806f2172f681001cfa64b.tar.xz forums-b60892d200247b4d608806f2172f681001cfa64b.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/9827] No longer emulate Internet Explorer 7 when using IE9.
[ticket/9850] Display upgrade instructions for feature release in acp
[ticket/9835] subsilver2: Don't show "To prevent automated ..." when logging in
Diffstat (limited to 'phpBB/adm')
| -rw-r--r-- | phpBB/adm/style/acp_update.html | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/phpBB/adm/style/acp_update.html b/phpBB/adm/style/acp_update.html index 34d4f6934e..a87366a78b 100644 --- a/phpBB/adm/style/acp_update.html +++ b/phpBB/adm/style/acp_update.html @@ -18,6 +18,12 @@ </div> <!-- ENDIF --> + <!-- IF NEXT_FEATURE_VERSION --> + <div class="errorbox"> + <p>{UPGRADE_INSTRUCTIONS}</p> + </div> + <!-- ENDIF --> + <fieldset> <legend></legend> <dl> |