Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
authorsadposter <hannah+pleroma@coffee-and-dreams.uk>
Sun, 30 Aug 2020 01:05:25 +0000 (02:05 +0100)
committersadposter <hannah+pleroma@coffee-and-dreams.uk>
Sun, 30 Aug 2020 01:05:25 +0000 (02:05 +0100)
commit7ac5f210ea386b9c0e75626a71fd01c6ef9d4408
tree3cf4eb18171bd85de41fd0af9c0e9bc33c378ede
parent166db7a3b63af2f16c5be361be10c16d09b49201
parent51844b1e420fdfbceed6fda85e4c2e0ad87a9b1e
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
config/config.exs