Ivan Tashkinov 908cf22a6c Merge remote-tracking branch 'remotes/origin/develop' into automatic-authentication-and-instance-publicity-checks ... # Conflicts: # lib/pleroma/web/mastodon_api/controllers/account_controller.ex		2020-04-28 19:56:20 +03:00
..
token	Update Copyrights	2020-03-03 16:44:49 -06:00
app.ex	…
authorization.ex	…
fallback_controller.ex	…
oauth_controller.ex	…
oauth_view.ex	…
scopes.ex	…
token.ex	…