Maxim Filippov 46787b9fe1 Merge branch 'develop' into feature/reports-groups-and-multiple-state-update		2019-11-11 19:18:12 +09:00
..
activity_pub	Merge branch 'develop' into feature/reports-groups-and-multiple-state-update	2019-11-11 19:18:12 +09:00
admin_api	Merge branch 'develop' into feature/reports-groups-and-multiple-state-update	2019-11-08 18:30:49 +09:00
auth
common_api	Merge branch 'develop' into feature/reports-groups-and-multiple-state-update	2019-11-05 02:12:48 +03:00
feed	add subject to atom feed	2019-11-10 11:10:20 +03:00
instances
mastodon_api	Mastodon API: Add the recipients parameter to GET /api/v1/conversations	2019-11-07 08:26:24 +03:00
media_proxy
metadata
mongooseim
oauth
ostatus
pleroma_api/controllers
plugs
push
rich_media
streamer	Mastodon API, streaming: Add pleroma.direct_conversation_id to the conversation stream event payload.	2019-11-04 18:36:16 +03:00
twitter_api	Merge remote-tracking branch 'upstream/develop' into refactor/following-relationships	2019-10-24 14:55:36 +07:00
views
web_finger
fallback_test.exs
federator_test.exs
masto_fe_controller_test.exs
node_info_test.exs
rel_me_test.exs	add missing tesla mocks	2019-11-04 15:18:32 +00:00
uploader_controller_test.exs