Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
authorsadposter <hannah+pleroma@coffee-and-dreams.uk>
Thu, 9 Jul 2020 21:22:25 +0000 (22:22 +0100)
committersadposter <hannah+pleroma@coffee-and-dreams.uk>
Thu, 9 Jul 2020 21:22:25 +0000 (22:22 +0100)
commit02a2f25027fc0eb76e8e9cbc3765ea9798b27f61
treed689c2f4125bbd4a0a62c3f2085d7fc55ad11599
parent1389ae9aab7ff1fe04126ccc93c02781408bd005
parent4301ae386154b5c6b863034491fe930ae8975459
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
config/config.exs