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
..
config.exs	[#923] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth	2019-03-18 10:26:41 +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	[#114] Added /dev/mailbox dev-only route (emails preview). Added mailer config examples.	2018-12-12 17:02:41 +03:00
test.exs	Enable dedupe by default	2019-03-15 12:11:13 +03:00