diff options
| author | Nils Adermann <naderman@naderman.de> | 2010-03-03 23:32:09 +0100 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2010-03-03 23:32:09 +0100 |
| commit | 693a2dc99bf07aeac1865d4a48ddf2589317ac7a (patch) | |
| tree | 8bd926d3671dc9de0a72d4025aaa625a18ba51e1 /phpBB/styles/prosilver/template/viewtopic_print.html | |
| parent | b68de2323d6444b4b3685a98bbcb9500a38e45cb (diff) | |
| parent | ac329275662f737f03f485107cb69412739c1afa (diff) | |
| download | forums-693a2dc99bf07aeac1865d4a48ddf2589317ac7a.tar forums-693a2dc99bf07aeac1865d4a48ddf2589317ac7a.tar.gz forums-693a2dc99bf07aeac1865d4a48ddf2589317ac7a.tar.bz2 forums-693a2dc99bf07aeac1865d4a48ddf2589317ac7a.tar.xz forums-693a2dc99bf07aeac1865d4a48ddf2589317ac7a.zip | |
Merge branch 'develop-olympus' into develop
I simply used the develop-olympus version of all files that conflicted.
Afterall there should not have been anything new in develop yet.
Diffstat (limited to 'phpBB/styles/prosilver/template/viewtopic_print.html')
| -rw-r--r-- | phpBB/styles/prosilver/template/viewtopic_print.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/styles/prosilver/template/viewtopic_print.html b/phpBB/styles/prosilver/template/viewtopic_print.html index be1feb9208..03102dd351 100644 --- a/phpBB/styles/prosilver/template/viewtopic_print.html +++ b/phpBB/styles/prosilver/template/viewtopic_print.html @@ -36,7 +36,7 @@ <div class="post"> <h3>{postrow.POST_SUBJECT}</h3> <div class="date">{postrow.MINI_POST_IMG}{L_POSTED}: <strong>{postrow.POST_DATE}</strong></div> - <div class="author">{L_POST_BY_AUTHOR} <strong<!-- IF postrow.POST_AUTHOR_COLOUR --> style="color: {postrow.POST_AUTHOR_COLOUR}"<!-- ENDIF -->>{postrow.POST_AUTHOR}</strong></div> + <div class="author">{L_POST_BY_AUTHOR} <strong>{postrow.POST_AUTHOR}</strong></div> <div class="content">{postrow.MESSAGE}</div> </div> <hr /> |