Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
authorsadposter <hannah+pleroma@coffee-and-dreams.uk>
Sun, 15 Nov 2020 19:40:23 +0000 (19:40 +0000)
committersadposter <hannah+pleroma@coffee-and-dreams.uk>
Sun, 15 Nov 2020 19:40:23 +0000 (19:40 +0000)
commit79472365751aa34d0029a89c0fc002e09a9bbea6
tree3701b932c62176101f9fa1bba7cce0c4ea7b1b8c
parentddf36b096e3f6e2fa1cdca5d59db98ade696df20
parent28da36975dc325bb577ee81fb791fbdc7ec3e7e2
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
config/config.exs