rinpatch f38c316e6e Merge branch 'bugfix/oauth-scopes-join' into 'develop' ... Bugfix: OAuth scopes formatting Closes #702 See merge request pleroma/pleroma!881		2019-03-02 06:39:07 +00:00
..
app.ex	[#468] Merged `upstream/develop`, resolved conflicts.	2019-02-17 14:07:04 +03:00
authorization.ex	[#468] Merged `upstream/develop`, resolved conflicts.	2019-02-17 14:07:04 +03:00
fallback_controller.ex	Correctly handle invalid credentials on auth login.	2019-01-28 11:41:47 +01:00
oauth_controller.ex	Merge branch 'bugfix/oauth-scopes-join' into 'develop'	2019-03-02 06:39:07 +00:00
oauth_view.ex	update copyright years to 2019	2018-12-31 15:41:47 +00:00
token.ex	[#468] Merged `upstream/develop`.	2019-02-19 19:10:55 +03:00