Roman Chvanikov 01fe5abad1 Resolve conflicts

2019-06-07 01:20:50 +03:00

..

config.exs

Resolve conflicts

2019-06-07 01:20:50 +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

[#114] Added /dev/mailbox dev-only route (emails preview). Added mailer config examples.

2018-12-12 17:02:41 +03:00

test.exs

Resolve conflicts

2019-06-07 01:20:50 +03:00