Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
authorsadposter <hannah+pleroma@coffee-and-dreams.uk>
Sat, 1 Aug 2020 18:32:31 +0000 (19:32 +0100)
committersadposter <hannah+pleroma@coffee-and-dreams.uk>
Sat, 1 Aug 2020 18:32:31 +0000 (19:32 +0100)
commit992deaa09bea1ed30f5a0e8bc357e27e4fd45be4
treec3b658d4297e420d2d652e7f11ee7b6e9988a299
parent02a2f25027fc0eb76e8e9cbc3765ea9798b27f61
parent70951d042b5d7b12608a3f73a73c757fc4204449
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
.gitignore
config/config.exs
lib/mix/tasks/pleroma/user.ex