Alex Gleason 32ae8f4906 Merge remote-tracking branch 'pleroma/develop' into optional-config		2021-05-16 12:27:29 -05:00
..
benchmark.exs	web push http_client fix	2020-10-01 13:32:11 +03:00
config.exs	Upstream original followbot implementation	2021-03-30 11:10:03 -05:00
description.exs	Support for configuration via AdminFE	2021-03-30 11:10:43 -05:00
dev.exs
docker.exs
dokku.exs
emoji.txt	Load an emoji.txt specific to the test env	2021-02-03 16:40:59 -06:00
prod.exs	Make prod.secret.exs optional (with warning)	2021-05-16 12:26:32 -05:00
test.exs	Avoid unnecessary 500ms sleeps from CommonAPI.follow when the target user is remote	2021-02-19 18:37:37 -06:00