kaniini f6b06d2ac8 Merge branch 'feature/peertube_2' into 'develop' ...

rebase/update of feature/peertube

See merge request pleroma/pleroma!217

2018-08-21 16:58:44 +00:00

..

views

Merge branch 'feature/peertube_2' into 'develop'

2018-08-21 16:58:44 +00:00

mastodon_api_controller.ex

Use activitypub to fetch posts.

2018-08-21 18:24:09 +02:00

mastodon_api.ex

Format the code.

2018-03-30 15:01:53 +02:00

mastodon_socket.ex

MastodonAPI: Add streaming to media tabs of federated and local TLs

2018-06-17 16:17:15 +02:00