Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
authorsadposter <hannah+pleroma@coffee-and-dreams.uk>
Fri, 19 Nov 2021 13:43:24 +0000 (13:43 +0000)
committersadposter <hannah+pleroma@coffee-and-dreams.uk>
Fri, 19 Nov 2021 13:43:24 +0000 (13:43 +0000)
1  2 
config/config.exs

Simple merge