diff options
author | Joas Schilling <nickvergessen@gmx.de> | 2015-01-06 11:25:26 +0100 |
---|---|---|
committer | Joas Schilling <nickvergessen@gmx.de> | 2015-01-06 11:25:26 +0100 |
commit | ba90746ce5325c75fd0ed53d7b0185ae2d74a614 (patch) | |
tree | 0159717ff638d773028d29d04b75d9573b56c0ba /phpBB/docs | |
parent | 1ed61fc39fe6280ef79c155ab956be741c9ed21d (diff) | |
parent | 874356e57f2de62260e455b6063330d1eb3badf4 (diff) | |
download | forums-ba90746ce5325c75fd0ed53d7b0185ae2d74a614.tar forums-ba90746ce5325c75fd0ed53d7b0185ae2d74a614.tar.gz forums-ba90746ce5325c75fd0ed53d7b0185ae2d74a614.tar.bz2 forums-ba90746ce5325c75fd0ed53d7b0185ae2d74a614.tar.xz forums-ba90746ce5325c75fd0ed53d7b0185ae2d74a614.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.md | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/phpBB/docs/events.md b/phpBB/docs/events.md index 7ee79813f5..e4cb80b127 100644 --- a/phpBB/docs/events.md +++ b/phpBB/docs/events.md @@ -1320,6 +1320,20 @@ viewtopic_body_poll_question_prepend * Since: 3.1.0-b3 * Purpose: Add content directly before the poll question on the View topic screen +viewtopic_body_post_author_after +=== +* Locations: + + styles/prosilver/template/viewtopic_body.html +* Since: 3.1.3-RC1 +* Purpose: Add content directly after the post author on the view topic screen + +viewtopic_body_post_author_before +=== +* Locations: + + styles/prosilver/template/viewtopic_body.html +* Since: 3.1.3-RC1 +* Purpose: Add content directly before the post author on the view topic screen + viewtopic_body_post_buttons_after === * Locations: |