diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2015-08-20 10:23:56 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2015-08-20 10:23:56 +0200 |
| commit | 648389af6f5fa53062d93a63f5bb5cb1ec0a65c0 (patch) | |
| tree | 4957a6aef430735e27b822997c2b8573cce46d54 /phpBB/docs | |
| parent | 7cdaa03e20c8610445aa62925d2cf9c7b9395c52 (diff) | |
| parent | ffe72e500c3039ac5691bc1f3bbab203d8d4779f (diff) | |
| download | forums-648389af6f5fa53062d93a63f5bb5cb1ec0a65c0.tar forums-648389af6f5fa53062d93a63f5bb5cb1ec0a65c0.tar.gz forums-648389af6f5fa53062d93a63f5bb5cb1ec0a65c0.tar.bz2 forums-648389af6f5fa53062d93a63f5bb5cb1ec0a65c0.tar.xz forums-648389af6f5fa53062d93a63f5bb5cb1ec0a65c0.zip | |
Merge branch '3.1.x'
Conflicts:
phpBB/docs/events.md
phpBB/styles/subsilver2/template/mcp_forum.html
Diffstat (limited to 'phpBB/docs')
| -rw-r--r-- | phpBB/docs/events.md | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/phpBB/docs/events.md b/phpBB/docs/events.md index 6f334caa79..acf555ecd3 100644 --- a/phpBB/docs/events.md +++ b/phpBB/docs/events.md @@ -1211,7 +1211,9 @@ topiclist_row_prepend * Locations: + styles/prosilver/template/search_results.html + styles/prosilver/template/viewforum_body.html + + styles/prosilver/template/mcp_forum.html * Since: 3.1.0-a1 +* Changed: 3.1.6-RC1 Added event to mcp_forum.html * Purpose: Add content into topic rows (inside the elements containing topic titles) topiclist_row_append @@ -1219,7 +1221,9 @@ topiclist_row_append * Locations: + styles/prosilver/template/search_results.html + styles/prosilver/template/viewforum_body.html + + styles/prosilver/template/mcp_forum.html * Since: 3.1.0-a1 +* Changed: 3.1.6-RC1 Added event to mcp_forum.html * Purpose: Add content into topic rows (inside the elements containing topic titles) ucp_agreement_terms_after |