Ivan Tashkinov baffdcc480 [#923] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth ... # Conflicts: # mix.exs		2019-04-01 08:49:32 +03:00
..
config.exs	[#923] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth	2019-04-01 08:49:32 +03:00
dev.exs	Sign in via Twitter (WIP).	2019-03-11 20:37:26 +03:00
emoji.txt	add longfox emojis	2018-01-27 08:38:48 +09: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