8f88a90ca3
# Conflicts: # lib/pleroma/application.ex # lib/pleroma/config.ex |
||
---|---|---|
.. | ||
benchmark.exs | ||
config.exs | ||
description.exs | ||
dev.exs | ||
docker.exs | ||
dokku.exs | ||
emoji.txt | ||
prod.exs | ||
test.exs |
8f88a90ca3
# Conflicts: # lib/pleroma/application.ex # lib/pleroma/config.ex |
||
---|---|---|
.. | ||
benchmark.exs | ||
config.exs | ||
description.exs | ||
dev.exs | ||
docker.exs | ||
dokku.exs | ||
emoji.txt | ||
prod.exs | ||
test.exs |