Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
authorsadposter <hannah+pleroma@coffee-and-dreams.uk>
Sun, 1 Nov 2020 12:22:28 +0000 (12:22 +0000)
committersadposter <hannah+pleroma@coffee-and-dreams.uk>
Sun, 1 Nov 2020 12:22:28 +0000 (12:22 +0000)
commitddf36b096e3f6e2fa1cdca5d59db98ade696df20
treef33306f514982263e30dc18e38ceac63d378395d
parent2ed87fecfa98ca2885a581ba55351ddde038fd1c
parent38b481d112d531df45a991e67c96b9c9387cd29d
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
.gitignore
config/config.exs
lib/mix/tasks/pleroma/user.ex