Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
authorsadposter <hannah+pleroma@coffee-and-dreams.uk>
Tue, 23 Mar 2021 23:01:07 +0000 (23:01 +0000)
committersadposter <hannah+pleroma@coffee-and-dreams.uk>
Tue, 23 Mar 2021 23:01:07 +0000 (23:01 +0000)
1  2 
config/config.exs

Simple merge