diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2014-08-31 19:31:13 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2014-08-31 19:31:13 +0200 |
| commit | 34d8caf7735b25920cc73dedf0d3e373cbadda4a (patch) | |
| tree | 038a5acf4fe37a6e386861563dcb1f0c27f33bc3 /phpBB/styles | |
| parent | 05a7a578159ed325ee4acb29f2b2d4b873b62409 (diff) | |
| parent | 97c798a375dc5277ce03fccb1682cb0f0cebc976 (diff) | |
| download | forums-34d8caf7735b25920cc73dedf0d3e373cbadda4a.tar forums-34d8caf7735b25920cc73dedf0d3e373cbadda4a.tar.gz forums-34d8caf7735b25920cc73dedf0d3e373cbadda4a.tar.bz2 forums-34d8caf7735b25920cc73dedf0d3e373cbadda4a.tar.xz forums-34d8caf7735b25920cc73dedf0d3e373cbadda4a.zip | |
Merge branch 'develop-ascraeus' into develop
Conflicts:
phpBB/styles/subsilver2/template/viewtopic_body.html
Diffstat (limited to 'phpBB/styles')
| -rw-r--r-- | phpBB/styles/prosilver/template/viewtopic_body.html | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/phpBB/styles/prosilver/template/viewtopic_body.html b/phpBB/styles/prosilver/template/viewtopic_body.html index a51d65ae99..7ed8569798 100644 --- a/phpBB/styles/prosilver/template/viewtopic_body.html +++ b/phpBB/styles/prosilver/template/viewtopic_body.html @@ -302,6 +302,8 @@ <!-- IF postrow.BUMPED_MESSAGE --><div class="notice"><br /><br />{postrow.BUMPED_MESSAGE}</div><!-- ENDIF --> <!-- EVENT viewtopic_body_postrow_post_notices_after --> <!-- IF postrow.SIGNATURE --><div id="sig{postrow.POST_ID}" class="signature">{postrow.SIGNATURE}</div><!-- ENDIF --> + + <!-- EVENT viewtopic_body_postrow_post_content_footer --> </div> </div> |