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
..
authenticator.ex	[#923] OAuth: prototype of sign in / sign up with Twitter.	2019-03-15 17:08:03 +03:00
ldap_authenticator.ex	[#923] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth	2019-03-18 10:26:41 +03:00
pleroma_authenticator.ex	[#923] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth	2019-03-18 10:26:41 +03:00