rinpatch 65db5e9f52 Resolve merge conflicts

2019-06-01 16:29:58 +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

emoji.txt

Adding tag to emoji ets table

2019-04-01 17:17:57 +07:00

prod.exs

config/prod.exs: Remove server: true

2018-11-30 03:05:34 +01:00

test.exs

remove @websub and @ostatus module-level constants

2019-05-25 04:43:11 +00:00