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
..
mix/tasks/pleroma	robots.txt	2019-03-15 02:28:18 +00:00
pleroma	[#923] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth	2019-03-18 10:26:41 +03:00
jason_types.ex
transports.ex
xml_builder.ex