Ivan Tashkinov 64095961fe [#1234] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes ... # Conflicts: # CHANGELOG.md # lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex # lib/pleroma/web/router.ex		2019-10-02 20:42:40 +03:00
..
admin_secret_authentication_plug_test.exs	…
authentication_plug_test.exs	…
basic_auth_decoder_plug_test.exs	…
cache_control_test.exs	…
cache_test.exs	…
ensure_authenticated_plug_test.exs	…
ensure_public_or_authenticated_plug_test.exs	…
ensure_user_key_plug_test.exs	…
http_security_plug_test.exs	…
http_signature_plug_test.exs	…
idempotency_plug_test.exs	…
instance_static_test.exs	…
legacy_authentication_plug_test.exs	…
mapped_identity_to_signature_plug_test.exs	…
oauth_plug_test.exs	…
oauth_scopes_plug_test.exs	…
rate_limiter_test.exs	…
remote_ip_test.exs	…
session_authentication_plug_test.exs	…
set_format_plug_test.exs	…
set_locale_plug_test.exs	…
set_user_session_id_plug_test.exs	…
uploaded_media_plug_test.exs	…
user_enabled_plug_test.exs	…
user_fetcher_plug_test.exs	…
user_is_admin_plug_test.exs	…