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)
commita61207cf8f218b34998ab8eec0db6b7f59b3ba8d
tree4748e095897baba381f8a45673db9e8a553ad6f4
parenteb1c7d75f4456440ef63e158f50fec6ed10c8918
parentc97f99ccf2a51c7f1078d7a20006deae2df3d12c
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
config/config.exs