Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into frontend-bundles...
authorlain <lain@soykaf.club>
Tue, 4 Aug 2020 13:10:36 +0000 (15:10 +0200)
committerlain <lain@soykaf.club>
Tue, 4 Aug 2020 13:10:36 +0000 (15:10 +0200)
commit532d6f94aea5d4f53e846b8b77296f80a9ae68a0
tree1cecd20cbb2071b7076ce6748dc747e33613de63
parente26f2c913529748423384d467472f3ad06248ea4
parent28584bb2241c600fc6150fdae49b1eea6bd420e0
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into frontend-bundles-downloads
CHANGELOG.md
config/config.exs
config/description.exs
docs/configuration/cheatsheet.md