Sean King 1841bd8383 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remove/mastofe		2021-08-06 08:08:20 -06:00
..
benchmark.exs	Switch from the deprecated "use Mix.config" to "import Config"	2021-05-20 14:02:58 -05:00
config.exs	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remove/mastofe	2021-08-06 08:08:20 -06:00
description.exs	Fix merge conflicts with upstream	2021-06-04 14:42:44 -06:00
dev.exs	Merge branch 'plug-runtime-dev' into 'develop'	2021-05-28 18:57:45 +00:00
docker.exs	Remove dynamic config as default, add healthcheck	2019-09-03 09:31:52 -04:00
dokku.exs	Switch from the deprecated "use Mix.config" to "import Config"	2021-05-20 14:02:58 -05:00
emoji.txt	Load an emoji.txt specific to the test env	2021-02-03 16:40:59 -06:00
prod.exs	Switch from the deprecated "use Mix.config" to "import Config"	2021-05-20 14:02:58 -05:00
test.exs	Merge branch 'plug-runtime-dev' into 'develop'	2021-05-28 18:57:45 +00:00