aboutsummaryrefslogtreecommitdiffstats
path: root/view/atom_feed.tpl
diff options
context:
space:
mode:
authorAlexander Kampmann <programmer@nurfuerspam.de>2012-03-22 12:50:02 +0100
committerAlexander Kampmann <programmer@nurfuerspam.de>2012-03-22 12:50:02 +0100
commitcea7ca1df4fd8065c38a4f43a0f13ba89e8b94e2 (patch)
treeb88556dbafbabac5753bdec9e51fcb24ec4ca3b8 /view/atom_feed.tpl
parent29900febb341cfbec6e4445d4ea1c2dc782a521a (diff)
parent808180ce5f9471aa36faf8861fb84d04b412f412 (diff)
downloadvolse-hubzilla-cea7ca1df4fd8065c38a4f43a0f13ba89e8b94e2.tar.gz
volse-hubzilla-cea7ca1df4fd8065c38a4f43a0f13ba89e8b94e2.tar.bz2
volse-hubzilla-cea7ca1df4fd8065c38a4f43a0f13ba89e8b94e2.zip
Merge branch 'master' of git://github.com/friendica/friendica
Conflicts: boot.php database.sql include/template_processor.php update.php
Diffstat (limited to 'view/atom_feed.tpl')
-rwxr-xr-xview/atom_feed.tpl1
1 files changed, 1 insertions, 0 deletions
diff --git a/view/atom_feed.tpl b/view/atom_feed.tpl
index 72cf8e4fd..2feb547ee 100755
--- a/view/atom_feed.tpl
+++ b/view/atom_feed.tpl
@@ -16,6 +16,7 @@
<link rel="license" href="http://creativecommons.org/licenses/by/3.0/" />
$hub
$salmon
+ $community
<updated>$feed_updated</updated>