diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2015-08-22 08:14:18 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2015-08-22 08:14:18 +0200 |
| commit | c8db7ae7c44c32fc206558fc60340002d0f8ca2a (patch) | |
| tree | 858cfaf1c0e24f921749229519c47ed89b24509e /phpBB/styles | |
| parent | d30b5207b88ded150cd33730f9cfd2d56c83edaa (diff) | |
| parent | a959e5f4ccd045a38af74f4ff93d18f98c83ed93 (diff) | |
| download | forums-c8db7ae7c44c32fc206558fc60340002d0f8ca2a.tar forums-c8db7ae7c44c32fc206558fc60340002d0f8ca2a.tar.gz forums-c8db7ae7c44c32fc206558fc60340002d0f8ca2a.tar.bz2 forums-c8db7ae7c44c32fc206558fc60340002d0f8ca2a.tar.xz forums-c8db7ae7c44c32fc206558fc60340002d0f8ca2a.zip | |
Merge branch '3.1.x'
Conflicts:
phpBB/styles/subsilver2/template/overall_header.html
Diffstat (limited to 'phpBB/styles')
| -rw-r--r-- | phpBB/styles/prosilver/template/overall_header.html | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/phpBB/styles/prosilver/template/overall_header.html b/phpBB/styles/prosilver/template/overall_header.html index ebe6470fee..45f8eaa1c9 100644 --- a/phpBB/styles/prosilver/template/overall_header.html +++ b/phpBB/styles/prosilver/template/overall_header.html @@ -14,6 +14,7 @@ <!-- IF S_ENABLE_FEEDS_TOPICS_ACTIVE --><link rel="alternate" type="application/atom+xml" title="{L_FEED} - {L_FEED_TOPICS_ACTIVE}" href="{U_FEED}?mode=topics_active"><!-- ENDIF --> <!-- IF S_ENABLE_FEEDS_FORUM and S_FORUM_ID --><link rel="alternate" type="application/atom+xml" title="{L_FEED} - {L_FORUM} - {FORUM_NAME}" href="{U_FEED}?f={S_FORUM_ID}"><!-- ENDIF --> <!-- IF S_ENABLE_FEEDS_TOPIC and S_TOPIC_ID --><link rel="alternate" type="application/atom+xml" title="{L_FEED} - {L_TOPIC} - {TOPIC_TITLE}" href="{U_FEED}?f={S_FORUM_ID}&t={S_TOPIC_ID}"><!-- ENDIF --> + <!-- EVENT overall_header_feeds --> <!-- ENDIF --> <!-- IF U_CANONICAL --> |