Merge branch 'develop-ascraeus' into develop

Conflicts:
	phpBB/styles/subsilver2/template/overall_footer.html
This commit is contained in:
Joas Schilling 2014-12-27 14:03:34 +01:00
commit fbe0f04132
2 changed files with 9 additions and 0 deletions

View file

@ -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:

View file

@ -48,5 +48,7 @@
<!-- IF S_PLUPLOAD --><!-- INCLUDE plupload.html --><!-- ENDIF -->
{$SCRIPTS}
<!-- EVENT overall_footer_body_after -->
</body>
</html>