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.ex	tests for mastodon_api_controller.ex	2019-09-06 21:50:00 +03:00
authorization.ex	Replace `Pleroma.FlakeId` with `flake_id` hex package	2019-09-25 17:14:31 +07:00
fallback_controller.ex	Wrap error messages into gettext helpers	2019-07-10 18:10:09 +07:00
oauth_controller.ex	Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes	2019-10-06 11:43:49 +03:00
oauth_view.ex	[#923] OAuth: prototype of sign in / sign up with Twitter.	2019-03-15 17:08:03 +03:00
scopes.ex	[#1234] Mastodon 2.4.3 hierarchical scopes initial support (WIP).	2019-09-08 15:00:03 +03:00
token.ex	Replace `Pleroma.FlakeId` with `flake_id` hex package	2019-09-25 17:14:31 +07:00