Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
authorsadposter <hannah+pleroma@coffee-and-dreams.uk>
Mon, 24 Aug 2020 16:04:51 +0000 (17:04 +0100)
committersadposter <hannah+pleroma@coffee-and-dreams.uk>
Mon, 24 Aug 2020 16:04:51 +0000 (17:04 +0100)
commit166db7a3b63af2f16c5be361be10c16d09b49201
treea07047d2d4156002370f7f451094d324ad8deadd
parent735ceb2115809037006d870ce8f8fb27c444bb56
parente1c8c599ff12699692ec7f06efc44064ee5ecb0b
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
config/config.exs