mirror of
https://git.pleroma.social/pleroma/pleroma.git
synced 2024-12-23 08:36:29 +00:00
b312c36b8e
# Conflicts: # config/description.exs |
||
---|---|---|
.. | ||
benchmark.exs | ||
config.exs | ||
description.exs | ||
dev.exs | ||
docker.exs | ||
dokku.exs | ||
emoji.txt | ||
prod.exs | ||
releases.exs | ||
test.exs |