Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into frontend-bundles...
authorlain <lain@soykaf.club>
Tue, 25 Aug 2020 09:44:51 +0000 (11:44 +0200)
committerlain <lain@soykaf.club>
Tue, 25 Aug 2020 09:44:51 +0000 (11:44 +0200)
commitc1d51944c71ff90650b1a631241daf0d8be5b861
tree2e78efaeb892c4b09cac0439f268d6a60637b4dc
parent199ad47c22e5d72741f5809eb015bac9b00cca03
parent5722b0e2e5e7113f0422798a6ea8cc40d1953291
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