Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
authorsadposter <hannah+pleroma@coffee-and-dreams.uk>
Thu, 26 Sep 2019 22:22:24 +0000 (23:22 +0100)
committersadposter <hannah+pleroma@coffee-and-dreams.uk>
Thu, 26 Sep 2019 22:22:24 +0000 (23:22 +0100)
1  2 
lib/mix/tasks/pleroma/user.ex

Simple merge