Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
authorsadposter <hannah+pleroma@coffee-and-dreams.uk>
Mon, 2 Aug 2021 21:10:01 +0000 (22:10 +0100)
committersadposter <hannah+pleroma@coffee-and-dreams.uk>
Mon, 2 Aug 2021 21:10:01 +0000 (22:10 +0100)
commit2519d4eb1acb54d36a3bdfd90fcff4afc64b3f08
tree55aa9590f0144d1802a1cad516b611ab0f3255bd
parentde69585eaa386a580e1cdaa9eea034d8335b1bb2
parentd8a986c9e893de8eed3aa336a557695669b1ffee
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
config/config.exs