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)
commita9938611f7f3771dc9cf10fb0d0d9f78c4e2f80d
tree999f1f2a4339fc268dc87398efd572eb61c3c1f8
parent95a1e5bf5a9cc0d46b5fc209cd7e688b297ae905
parent241f7cb1ed91a8d6855dbd03517e85c98c08edb7
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
config/config.exs
lib/mix/tasks/pleroma/user.ex