Pleroma/config
Ivan Tashkinov 6e6f95c6ae Merge remote-tracking branch 'remotes/origin/develop' into 1559-follow-request-notifications
# Conflicts:
#	CHANGELOG.md
2020-04-17 16:23:58 +03:00
..
benchmark.exs
config.exs Merge remote-tracking branch 'remotes/origin/develop' into 1559-follow-request-notifications 2020-04-17 16:23:58 +03:00
description.exs [#2342] Removed description.exs entry for temporary configuration option. 2020-04-13 15:38:50 +03:00
dev.exs
docker.exs
dokku.exs
emoji.txt
prod.exs
releases.exs
test.exs