rinpatch 026b245dbc Merge branch 'develop' into feature/polls-2-electric-boogalo		2019-06-03 11:14:52 +03:00
..
config.exs	Resolve merge conflicts	2019-06-01 16:29:58 +03:00
dev.exs	s/Pleroma.Mailer/Pleroma.Emails.Mailer/	2019-04-10 06:33:19 +02:00
dokku.exs	CI: Add auto-deployment via dokku.	2019-05-31 10:55:35 +02:00
emoji.txt	Adding tag to emoji ets table	2019-04-01 17:17:57 +07:00
prod.exs
test.exs	remove @websub and @ostatus module-level constants	2019-05-25 04:43:11 +00:00