Ivan Tashkinov 2a96283efb [#923] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth ... # Conflicts: # config/config.exs # lib/pleroma/web/auth/pleroma_authenticator.ex		2019-03-18 10:26:41 +03:00
..
app.ex	[#468] Merged upstream/develop, resolved conflicts.	2019-02-17 14:07:04 +03:00
authorization.ex	[Credo] fix Credo.Check.Readability.AliasOrder	2019-03-13 04:26:54 +01:00
fallback_controller.ex	Correctly handle invalid credentials on auth login.	2019-01-28 11:41:47 +01:00
oauth_controller.ex	[#923] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth	2019-03-18 10:26:41 +03:00
oauth_view.ex	[#923] OAuth: prototype of sign in / sign up with Twitter.	2019-03-15 17:08:03 +03:00
token.ex	[Credo] fix Credo.Check.Readability.AliasOrder	2019-03-13 04:26:54 +01:00