Ivan Tashkinov 6f67aed3ac [#1234] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes ... # Conflicts: # lib/pleroma/web/admin_api/admin_api_controller.ex		2019-09-19 10:59:09 +03:00
..
token	Bump copyright years of files changed in 2019	2019-09-18 23:21:11 +02:00
app.ex	differences_in_mastoapi_responses.md: fullname & bio are optionnal	2019-05-13 18:35:45 +00:00
authorization.ex	[#184] small refactoring reset password	2019-06-24 19:01:56 +00:00
fallback_controller.ex	Wrap error messages into gettext helpers	2019-07-10 18:10:09 +07:00
oauth_controller.ex	[#1234] Mastodon 2.4.3 hierarchical scopes initial support (WIP).	2019-09-08 15:00:03 +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	constants: add as_public constant and use it everywhere	2019-07-29 02:43:19 +00:00