aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/docs
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2014-12-27 14:03:34 +0100
committerJoas Schilling <nickvergessen@gmx.de>2014-12-27 14:03:34 +0100
commitfbe0f0413243203c187e1c96e6c34dae051ea795 (patch)
tree4067fe6ec824ce5d31af64fbb68ac88a7af0f879 /phpBB/docs
parent228fda0f0336192ee57823899d54cf1dfcd89ecd (diff)
parentfa06c7967eb423589f2f7fd5202bf72faa2aeee0 (diff)
downloadforums-fbe0f0413243203c187e1c96e6c34dae051ea795.tar
forums-fbe0f0413243203c187e1c96e6c34dae051ea795.tar.gz
forums-fbe0f0413243203c187e1c96e6c34dae051ea795.tar.bz2
forums-fbe0f0413243203c187e1c96e6c34dae051ea795.tar.xz
forums-fbe0f0413243203c187e1c96e6c34dae051ea795.zip
Merge branch 'develop-ascraeus' into develop
Conflicts: phpBB/styles/subsilver2/template/overall_footer.html
Diffstat (limited to 'phpBB/docs')
-rw-r--r--phpBB/docs/events.md7
1 files changed, 7 insertions, 0 deletions
diff --git a/phpBB/docs/events.md b/phpBB/docs/events.md
index 48083b2ce0..bc71b5b05f 100644
--- a/phpBB/docs/events.md
+++ b/phpBB/docs/events.md
@@ -594,6 +594,13 @@ overall_footer_after
* Since: 3.1.0-a1
* Purpose: Add content at the end of the file, directly prior to the `</body>` tag
+overall_footer_body_after
+===
+* Locations:
+ + styles/prosilver/template/overall_footer.html
+* Since: 3.1.3-RC1
+* Purpose: Add content before the `</body>` tag but after the $SCRIPTS var, i.e. after the js scripts have been loaded
+
overall_footer_breadcrumb_append
===
* Locations: