diff options
| author | Michael <icarus@dabo.de> | 2012-05-16 08:10:28 +0200 |
|---|---|---|
| committer | Michael <icarus@dabo.de> | 2012-05-16 08:10:28 +0200 |
| commit | 2b8c4df544f59d611ad1e8fc0dbc5fcd38bee8f7 (patch) | |
| tree | 8c569c61c06e50c943addc132286d44c2f8ec178 /view/api_timeline_xml.tpl | |
| parent | 188829ed46be6d3c7a91380226e26e8292c327be (diff) | |
| parent | a3f08c44be78d4517e9f1619811def09b2ec7e7a (diff) | |
| download | volse-hubzilla-2b8c4df544f59d611ad1e8fc0dbc5fcd38bee8f7.tar.gz volse-hubzilla-2b8c4df544f59d611ad1e8fc0dbc5fcd38bee8f7.tar.bz2 volse-hubzilla-2b8c4df544f59d611ad1e8fc0dbc5fcd38bee8f7.zip | |
Merge branch 'master' of github.com:annando/friendica
Diffstat (limited to 'view/api_timeline_xml.tpl')
| -rw-r--r-- | view/api_timeline_xml.tpl | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/view/api_timeline_xml.tpl b/view/api_timeline_xml.tpl index 551439682..4a32b411b 100644 --- a/view/api_timeline_xml.tpl +++ b/view/api_timeline_xml.tpl @@ -11,6 +11,7 @@ <geo>$status.geo</geo> <favorited>$status.favorited</favorited> {{ inc api_user_xml.tpl with $user=$status.user }}{{ endinc }} <statusnet:html>$status.statusnet_html</statusnet:html> + <statusnet:conversation_id>$status.statusnet_conversation_id</statusnet:conversation_id> <url>$status.url</url> <coordinates>$status.coordinates</coordinates> <place>$status.place</place> |