Friendica/friendica
Friendica/friendica
1
0
Fork 1
mirror of https://git.friendi.ca/friendica/friendica.git synced 2025-06-17 03:25:15 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'upstream/develop' into 1602-diaspora

Browse source
This commit is contained in:
Michael Vogel 2016-03-24 16:19:52 +01:00
commit ec90a9e6ad
2 changed files with 13 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
include/api.php
View file

@ -1550,6 +1550,7 @@
return api_apply_template("timeline", $type, $data);
}
api_register_func('api/conversation/show','api_conversation_show', true);
api_register_func('api/statusnet/conversation','api_conversation_show', true);
/**