Ivan Tashkinov 45765918c3 [#923] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth ... # Conflicts: # mix.exs		2019-04-04 23:43:08 +03:00
..
config.exs	[#923] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth	2019-04-04 23:43:08 +03:00
dev.exs	Sign in via Twitter (WIP).	2019-03-11 20:37:26 +03:00
emoji.txt	Revert renaming emoji.txt	2018-01-31 23:47:42 +02:00
prod.exs	config/prod.exs: Remove server: true	2018-11-30 03:05:34 +01:00
test.exs	Replace Pleroma.Jobs with pleroma_job_queue	2019-03-29 12:46:05 +00:00