Alex Gleason 44723db71a Merge branch 'develop' into 'default-hellthread' ... # Conflicts: # config/soapbox.exs		2022-02-07 05:33:38 +00:00
..
benchmark.exs	Fix benchmarks	2021-12-03 16:20:54 -05:00
config.exs	Merge remote-tracking branch 'pleroma/develop' into merge-upstream	2022-02-06 12:31:53 -06:00
description.exs	Merge remote-tracking branch 'pleroma/develop' into merge-upstream	2022-02-06 12:31:53 -06:00
dev.exs	use puts instead warn	2021-07-27 21:01:41 +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
soapbox.exs	Merge branch 'develop' into 'default-hellthread'	2022-02-07 05:33:38 +00:00
test.exs	Merge branch 'plug-runtime-dev' into 'develop'	2021-05-28 18:57:45 +00:00