Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
authorsadposter <hannah+pleroma@coffee-and-dreams.uk>
Fri, 2 Oct 2020 14:09:47 +0000 (15:09 +0100)
committersadposter <hannah+pleroma@coffee-and-dreams.uk>
Fri, 2 Oct 2020 14:09:47 +0000 (15:09 +0100)
1  2 
config/config.exs
lib/mix/tasks/pleroma/user.ex

Simple merge
Simple merge