Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
authorsadposter <hannah+pleroma@coffee-and-dreams.uk>
Wed, 12 May 2021 15:13:30 +0000 (16:13 +0100)
committersadposter <hannah+pleroma@coffee-and-dreams.uk>
Wed, 12 May 2021 15:13:30 +0000 (16:13 +0100)
commit50a644a2215a144e54a9f9d2a5216bec4e717405
tree04d4e31310ec90d70cda69086741cd388c00c80e
parent5f62b55a6f71669d7aba358bd57f8319b724c9c8
parent745375bdcf2679ff803dd4ebc4a8313a7b5fb157
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
config/config.exs