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
..
controllers	configurable lifetime for ephemeral activities	2020-09-10 21:51:59 +03:00
views
mastodon_api_controller_test.exs
mastodon_api_test.exs