lain 436d1a3c41 Merge branch 'develop' into 'issue/2115' ... # Conflicts: # CHANGELOG.md		2020-09-23 11:49:19 +00:00
..
activity_pub	Merge remote-tracking branch 'remotes/origin/develop' into media-preview-proxy-nostream	2020-09-17 22:22:59 +03:00
admin_api	Merge remote-tracking branch 'upstream/develop' into email-fix-develop	2020-09-22 13:37:02 -05:00
api_spec
auth
common_api	Fix MRF reject for ChatMessage	2020-09-17 22:07:54 +03:00
fed_sockets	Federate data through persistent websocket connections	2020-09-18 11:58:22 +00:00
feed
instances	instance: Handle not getting a favicon	2020-09-11 11:37:46 +02:00
mastodon_api	Merge remote-tracking branch 'upstream/develop' into email-fix-develop	2020-09-22 13:37:02 -05:00
media_proxy	[#2497] Configurability of :min_content_length (preview proxy). Refactoring, documentation, tests.	2020-09-17 17:13:40 +03:00
metadata	adapt to new user factory behavior	2020-09-17 12:32:40 -04:00
mongooseim
oauth	schedule expired oauth tokens deletion with Oban	2020-09-10 16:01:19 +03:00
ostatus
pleroma_api	Merge branch 'develop' into 'issue/2115'	2020-09-23 11:49:19 +00:00
plugs
preload
push	Make WebPushEncryption use Pleroma.HTTP as an HTTP adapter	2020-09-17 22:10:55 +02:00
rich_media	Merge branch 'feat/rich-media-head' into 'develop'	2020-09-17 19:04:50 +03:00
static_fe
streamer	[#2074] OAuth scope checking in Streaming API.	2020-09-19 19:16:55 +03:00
twitter_api	Merge branch 'develop' into issue/2099	2020-09-17 08:41:35 +03: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