aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/docs
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2015-02-02 23:07:33 +0100
committerJoas Schilling <nickvergessen@gmx.de>2015-02-02 23:07:33 +0100
commit7f8a72670297ffa7fbb46787b8ad1a67ef4afd8b (patch)
tree48b2f398b04f8146276459cecdfa729af5c8bab5 /phpBB/docs
parentf31d12ddf2905ae84a44b74ad9dedda059de4c3a (diff)
parentb1336ae01600b0ff6fdc9272d9c244bb3e9e14db (diff)
downloadforums-7f8a72670297ffa7fbb46787b8ad1a67ef4afd8b.tar
forums-7f8a72670297ffa7fbb46787b8ad1a67ef4afd8b.tar.gz
forums-7f8a72670297ffa7fbb46787b8ad1a67ef4afd8b.tar.bz2
forums-7f8a72670297ffa7fbb46787b8ad1a67ef4afd8b.tar.xz
forums-7f8a72670297ffa7fbb46787b8ad1a67ef4afd8b.zip
Merge branch 'develop-ascraeus' into develop
Conflicts: phpBB/styles/subsilver2/template/viewtopic_body.html
Diffstat (limited to 'phpBB/docs')
-rw-r--r--phpBB/docs/events.md14
1 files changed, 14 insertions, 0 deletions
diff --git a/phpBB/docs/events.md b/phpBB/docs/events.md
index e4cb80b127..f01295f767 100644
--- a/phpBB/docs/events.md
+++ b/phpBB/docs/events.md
@@ -1387,6 +1387,20 @@ viewtopic_body_postrow_post_content_footer
* Since: 3.1.0-RC4
* Purpose: Add data at the end of the posts.
+viewtopic_body_postrow_post_details_after
+===
+* Locations:
+ + styles/prosilver/template/viewtopic_body.html
+* Since: 3.1.4-RC1
+* Purpose: Add content after the post details
+
+viewtopic_body_postrow_post_details_before
+===
+* Locations:
+ + styles/prosilver/template/viewtopic_body.html
+* Since: 3.1.4-RC1
+* Purpose: Add content before the post details
+
viewtopic_body_postrow_post_notices_after
===
* Locations: