Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into frontend-bundles...
authorlain <lain@soykaf.club>
Wed, 29 Jul 2020 14:24:22 +0000 (16:24 +0200)
committerlain <lain@soykaf.club>
Wed, 29 Jul 2020 14:24:22 +0000 (16:24 +0200)
commitdc36d6e9d21dc47fa9b6332c6444a055f789fabd
treed24ffb684053b9042339396eeb8bc02368ed6602
parentf715bf1915b75cb3c5b24d4661a94885aaa1a0ac
parenta6d3bb5f30697cafc5dd9acf490bde7e2f33f5f8
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into frontend-bundles-admin
CHANGELOG.md
config/config.exs
docs/configuration/cheatsheet.md