diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2015-02-27 22:10:27 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2015-02-27 22:10:27 +0100 |
| commit | 5d6f86800fb81eb20a81db3252e174ba155f12cb (patch) | |
| tree | 792a11cf4cab478549c558bf16182920905ec624 /phpBB/styles | |
| parent | f526e81ddff6dbf3c3fd2ebeda9928c553a64409 (diff) | |
| parent | a7b1b7192164c11262900267220860d7488657f6 (diff) | |
| download | forums-5d6f86800fb81eb20a81db3252e174ba155f12cb.tar forums-5d6f86800fb81eb20a81db3252e174ba155f12cb.tar.gz forums-5d6f86800fb81eb20a81db3252e174ba155f12cb.tar.bz2 forums-5d6f86800fb81eb20a81db3252e174ba155f12cb.tar.xz forums-5d6f86800fb81eb20a81db3252e174ba155f12cb.zip | |
Merge branch '3.1.x'
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, 1 insertions, 1 deletions
diff --git a/phpBB/styles/prosilver/template/viewtopic_body.html b/phpBB/styles/prosilver/template/viewtopic_body.html index 3b2c0a9c65..d39645cbe2 100644 --- a/phpBB/styles/prosilver/template/viewtopic_body.html +++ b/phpBB/styles/prosilver/template/viewtopic_body.html @@ -64,7 +64,7 @@ <!-- ENDIF --> </div> <!-- ENDIF --> - + <!-- EVENT viewtopic_body_pagination_top_after --> </div> <!-- IF S_HAS_POLL --> |