Maksim Pechnikov 6813c0302c Merge branch 'develop' into issue/1383		2020-02-10 20:49:20 +03:00
..
activity_pub	Merge branch 'cancel-follow-request' into 'develop'	2020-02-07 16:10:43 +00:00
admin_api	removing confusing error	2020-02-06 12:50:36 +03:00
auth
common_api	Merge branch 'cancel-follow-request' into 'develop'	2020-02-07 16:10:43 +00:00
feed
instances
mastodon_api	Merge branch 'develop' into issue/1383	2020-02-10 20:49:20 +03:00
media_proxy
metadata
mongooseim
oauth
ostatus
pleroma_api/controllers	Merge branch 'emoji-api-errors' into 'develop'	2020-01-30 14:13:40 +00:00
plugs
push
rich_media
static_fe
streamer	Merge branch 'fix-streaming-reblog' of git.pleroma.social:pleroma/pleroma into fix-streaming-reblog	2020-01-29 11:52:24 +01:00
twitter_api
views
web_finger
chat_channel_test.exs
fallback_test.exs
federator_test.exs
masto_fe_controller_test.exs
node_info_test.exs
rel_me_test.exs
uploader_controller_test.exs