Ivan Tashkinov 06b3bb54c5 Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes ... # Conflicts: # CHANGELOG.md # lib/pleroma/web/mastodon_api/controllers/account_controller.ex # lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex # lib/pleroma/web/router.ex		2019-10-06 11:43:49 +03:00
..
token	Bump copyright years of files changed in 2019	2019-09-18 23:21:11 +02:00
app_test.exs	tests for mastodon_api_controller.ex	2019-09-06 21:50:00 +03:00
authorization_test.exs	Bump copyright years of files changed in 2019	2019-09-18 23:21:11 +02:00
ldap_authorization_test.exs	added test helpers to clear config after tests	2019-08-19 15:34:29 +00:00
oauth_controller_test.exs	Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes	2019-10-06 11:43:49 +03:00
token_test.exs	Bump copyright years of files changed in 2019	2019-09-18 23:21:11 +02:00