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

Simple merge
Simple merge