Egor Kislitsyn 4944498133 Merge branch 'develop' into feature/compat/push-subscriptions ... # Conflicts: # lib/pleroma/application.ex # lib/pleroma/plugs/oauth_plug.ex		2018-12-06 20:15:16 +07:00
..
authentication_plug.ex
basic_auth_decoder_plug.ex
digest.ex
ensure_authenticated_plug.ex
ensure_user_key_plug.ex
federating_plug.ex
http_security_plug.ex	Plugs.HTTPSecurityPlug: Activate upgrade-insecure-requests only when there is https	2018-11-26 21:41:36 +01:00
http_signature.ex
legacy_authentication_plug.ex
oauth_plug.ex	Merge branch 'develop' into feature/compat/push-subscriptions	2018-12-06 20:15:16 +07:00
session_authentication_plug.ex
set_user_session_id_plug.ex
uploaded_media.ex	reverse proxy / uploads	2018-11-30 18:00:47 +01:00
user_enabled_plug.ex	More fixes for Info schema.	2018-12-01 12:46:08 +01:00
user_fetcher_plug.ex
user_is_admin_plug.ex	Fix admin api.	2018-12-01 09:03:16 +01:00