Ivan Tashkinov 0bda85857e Merge remote-tracking branch 'remotes/origin/develop' into media-preview-proxy ... # Conflicts: # lib/pleroma/instances/instance.ex		2020-09-11 17:19:58 +03:00
..
activity_pub	Merge remote-tracking branch 'remotes/origin/develop' into media-preview-proxy	2020-09-11 17:19:58 +03:00
admin_api	User table: ensure bio is always a string	2020-09-01 10:45:42 +03:00
api_spec	…
auth	copyright update	2020-05-18 15:15:51 +03:00
common_api	schedule activity expiration in Oban	2020-09-10 21:50:40 +03:00
feed	Do not serve RSS/Atom feeds when instance is private	2020-09-08 20:21:34 +03:00
instances	instance: Handle not getting a favicon	2020-09-11 11:37:46 +02:00
mastodon_api	Merge remote-tracking branch 'remotes/origin/develop' into media-preview-proxy	2020-09-11 17:19:58 +03:00
media_proxy	…
metadata	Metadata: Move restriction check from Feed provider to activated_providers	2020-09-08 20:21:34 +03:00
mongooseim	…
oauth	schedule expired oauth tokens deletion with Oban	2020-09-10 16:01:19 +03:00
ostatus	…
pleroma_api	…
plugs	…
preload	…
push	…
rich_media	RichMedia: do not log webpages missing metadata as errors	2020-09-05 22:05:35 +03:00
static_fe	…
streamer	…
twitter_api	expire mfa tokens through Oban	2020-09-10 16:01:19 +03:00
views	…
web_finger	…
chat_channel_test.exs	…
fallback_test.exs	…
federator_test.exs	…
masto_fe_controller_test.exs	…
node_info_test.exs	Nodeinfo: Add chat information back in.	2020-06-26 13:04:15 +02:00
rel_me_test.exs	…
uploader_controller_test.exs	…