You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Ivan Tashkinov 590c935d95 [#923] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth ... # Conflicts: # mix.exs		6 years ago
..
config.exs	[#923] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth	6 years ago
dev.exs	Sign in via Twitter (WIP).	6 years ago
emoji.txt	Revert renaming emoji.txt	7 years ago
prod.exs	[#114] Added /dev/mailbox dev-only route (emails preview). Added mailer config examples.	6 years ago
test.exs	Replace Pleroma.Jobs with `pleroma_job_queue`	6 years ago