Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
authorsadposter <hannah+pleroma@coffee-and-dreams.uk>
Mon, 7 Sep 2020 08:57:00 +0000 (09:57 +0100)
committersadposter <hannah+pleroma@coffee-and-dreams.uk>
Mon, 7 Sep 2020 08:57:00 +0000 (09:57 +0100)
1  2 
config/config.exs

Simple merge