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)
commitbe48c1bafb0765675012c71d79a41ac490a964b7
treeccf6f9d3f5413b6e9c2ffe7753458990cfcc8707
parent780ac9cedb9a5df96bce763f586779c4297b0f0a
parentd772361e6209e6b5733e9fe52b3671cd222060b3
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
config/config.exs
lib/mix/tasks/pleroma/user.ex