Ivan Tashkinov 39ce894a07 Merge remote-tracking branch 'remotes/origin/develop' into 1478-oauth-admin-scopes-tweaks ... # Conflicts: # lib/pleroma/user.ex		2020-01-10 16:18:32 +03:00
..
token	Bump copyright years of files changed in 2019	2019-09-18 23:21:11 +02:00
app_test.exs
authorization_test.exs	Bump copyright years of files changed in 2019	2019-09-18 23:21:11 +02:00
ldap_authorization_test.exs
oauth_controller_test.exs	Merge remote-tracking branch 'remotes/origin/develop' into 1478-oauth-admin-scopes-tweaks	2020-01-10 16:18:32 +03:00
token_test.exs	Bump copyright years of files changed in 2019	2019-09-18 23:21:11 +02:00