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	creating trusted app from adminFE & mix task	2020-03-23 10:44:47 +03:00
authorization.ex	Update Copyrights	2020-03-03 16:44:49 -06:00
fallback_controller.ex	Update Copyrights	2020-03-03 16:44:49 -06:00
oauth_controller.ex	[#2409] Tested all auth setup configs in AuthTestControllerTest. Adjusted :skip_plug definitions for some endpoints.	2020-04-24 16:52:38 +03:00
oauth_view.ex	Update Copyrights	2020-03-03 16:44:49 -06:00
scopes.ex	Support validation for inline OpenAPI schema and automatic tests for examples	2020-04-24 15:16:15 +04:00
token.ex	Update Copyrights	2020-03-03 16:44:49 -06:00