diff options
author | Alexander Kampmann <programmer@nurfuerspam.de> | 2012-03-22 12:50:02 +0100 |
---|---|---|
committer | Alexander Kampmann <programmer@nurfuerspam.de> | 2012-03-22 12:50:02 +0100 |
commit | cea7ca1df4fd8065c38a4f43a0f13ba89e8b94e2 (patch) | |
tree | b88556dbafbabac5753bdec9e51fcb24ec4ca3b8 /view/atom_feed_dfrn.tpl | |
parent | 29900febb341cfbec6e4445d4ea1c2dc782a521a (diff) | |
parent | 808180ce5f9471aa36faf8861fb84d04b412f412 (diff) | |
download | volse-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_dfrn.tpl')
-rwxr-xr-x | view/atom_feed_dfrn.tpl | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/view/atom_feed_dfrn.tpl b/view/atom_feed_dfrn.tpl index 3d6bcc5b5..0bae62b52 100755 --- a/view/atom_feed_dfrn.tpl +++ b/view/atom_feed_dfrn.tpl @@ -12,10 +12,11 @@ <id>$feed_id</id> <title>$feed_title</title> - <generator uri="http://friendika.com" version="$version">Friendika</generator> + <generator uri="http://friendica.com" version="$version">Friendica</generator> <link rel="license" href="http://creativecommons.org/licenses/by/3.0/" /> $hub $salmon + $community <updated>$feed_updated</updated> |