diff options
| author | Nils Adermann <naderman@naderman.de> | 2011-11-18 19:42:44 +0100 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2011-11-18 19:42:44 +0100 |
| commit | 0a4efcbe8c9e4fe13d4a726f30f38d01d1334e32 (patch) | |
| tree | 4f21631e83f71ffaa3c546b30e757b547b5b29c8 /phpBB/styles/prosilver/template/mcp_approve.html | |
| parent | a4acd62f3b12557a8af103c0f58dba0803b919ce (diff) | |
| parent | 6894477b600f4a1ffaa6c8ce7fde45465e1f5c07 (diff) | |
| download | forums-0a4efcbe8c9e4fe13d4a726f30f38d01d1334e32.tar forums-0a4efcbe8c9e4fe13d4a726f30f38d01d1334e32.tar.gz forums-0a4efcbe8c9e4fe13d4a726f30f38d01d1334e32.tar.bz2 forums-0a4efcbe8c9e4fe13d4a726f30f38d01d1334e32.tar.xz forums-0a4efcbe8c9e4fe13d4a726f30f38d01d1334e32.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/9956] Display error message if no disapprove reason given
Conflicts:
phpBB/includes/mcp/mcp_queue.php
Diffstat (limited to 'phpBB/styles/prosilver/template/mcp_approve.html')
| -rw-r--r-- | phpBB/styles/prosilver/template/mcp_approve.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/styles/prosilver/template/mcp_approve.html b/phpBB/styles/prosilver/template/mcp_approve.html index d967f55d89..1010ac6e6f 100644 --- a/phpBB/styles/prosilver/template/mcp_approve.html +++ b/phpBB/styles/prosilver/template/mcp_approve.html @@ -8,7 +8,7 @@ <div class="content"> <h2>{MESSAGE_TITLE}</h2> - <!-- IF ADDITIONAL_MSG --><p>{ADDITIONAL_MSG}</p><!-- ENDIF --> + <!-- IF ADDITIONAL_MSG --><p class="error">{ADDITIONAL_MSG}</p><!-- ENDIF --> <fieldset> <!-- IF S_NOTIFY_POSTER --> |