Mark Felder cddca85c84 Merge branch 'develop' into revert/rich-media-censorship		2020-10-06 14:25:20 -05:00
..
activity_pub	Merge branch 'filtering-following' into 'develop'	2020-10-06 18:11:34 +00: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	CommonAPI test: Add test for polls	2020-09-24 11:12:03 +02:00
fed_sockets	…
feed	…
instances	…
mastodon_api	Merge remote-tracking branch 'upstream/develop' into email-fix-develop	2020-09-22 13:37:02 -05:00
media_proxy	Adjusted MediaProxyControllerTest to gracefully fail on missing dependencies. Installation docs update.	2020-09-26 19:32:16 +03:00
metadata	…
mongooseim	…
oauth	…
ostatus	…
pleroma_api	fixes after rebase	2020-09-24 09:42:30 +03:00
plugs	…
preload	…
push	web push http_client fix	2020-10-01 13:32:11 +03:00
rich_media	Revert Rich Media censorship for sensitive statuses	2020-09-28 18:22:59 -05:00
static_fe	…
streamer	…
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	…