Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
authorsadposter <hannah+pleroma@coffee-and-dreams.uk>
Mon, 20 Apr 2020 23:24:32 +0000 (00:24 +0100)
committersadposter <hannah+pleroma@coffee-and-dreams.uk>
Mon, 20 Apr 2020 23:24:32 +0000 (00:24 +0100)
commit15042111016399a01d63276b7f63d58f4d331e46
tree650e95e0d3c87b256126a42be12018819bf17db5
parenteee32fd993f038a2b425f4d4f9bea8ff2d6c7b62
parente57c1b60e4a0f882d5217bf1be8b1a7240aa322d
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
config/config.exs