Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
authorsadposter <hannah+pleroma@coffee-and-dreams.uk>
Thu, 9 Jul 2020 21:22:25 +0000 (22:22 +0100)
committersadposter <hannah+pleroma@coffee-and-dreams.uk>
Thu, 9 Jul 2020 21:22:25 +0000 (22:22 +0100)
1  2 
config/config.exs

Simple merge