feld b312c36b8e Merge branch 'develop' into 'fix/rename-no_attachment_links-setting' ... # Conflicts: # config/description.exs		2020-02-13 14:37:55 +00: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	Fix the confusingly named and inverted logic of "no_attachment_links"	2020-02-11 15:39:19 -06:00
feed	fix test	2020-01-27 21:20:33 +03:00
instances
mastodon_api	Fix status.expires_in validation	2020-02-12 20:20:44 +04:00
media_proxy
metadata
mongooseim
oauth	updated error messages for authentication process	2020-01-17 15:01:37 +03:00
ostatus
pleroma_api/controllers	EmojiReactions: Remove old API endpoints	2020-02-07 15:01:45 +01:00
plugs
push
rich_media	Revert "Merge branch 'feat/floki-fasthtml' into 'develop'"	2020-02-11 16:55:18 +00:00
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	Restore TwitterAPI tests	2020-02-12 00:51:05 +04:00
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