sadposter 325372b1e1 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop		2019-08-07 08:59:31 +01:00
..
config.exs	add account confirmation email resend in mastodon api	2019-07-28 20:30:10 +00:00
custom_emoji.txt	Update emojo	2019-04-11 10:52:44 +01:00
dev.exs	Fixes for dynamic configuration	2019-06-20 17:43:57 +00:00
docker.exs	Run mix format	2019-08-03 13:42:57 -04:00
dokku.exs	CI: Add auto-deployment via dokku.	2019-05-31 10:55:35 +02:00
emoji.txt	Remove longfox emoji set	2019-08-04 04:32:45 +00:00
prod.exs	Fixes for dynamic configuration	2019-06-20 17:43:57 +00:00
releases.exs	Set instance static/uploads to be outside of application directory in release config	2019-06-14 01:42:56 +03:00
test.exs	Resolve merge conflicts	2019-07-20 22:04:47 +03:00