sadposter c4151feb48 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop		2019-06-03 13:29:35 +01:00
..
config.exs	Resolve merge conflicts	2019-06-01 16:29:58 +03:00
custom_emoji.txt	Update emojo	2019-04-11 10:52:44 +01: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	add instance resources	2019-05-30 12:11:56 +01: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	remove @websub and @ostatus module-level constants	2019-05-25 04:43:11 +00:00