Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
authorsadposter <hannah+pleroma@coffee-and-dreams.uk>
Sat, 6 Jun 2020 17:20:10 +0000 (18:20 +0100)
committersadposter <hannah+pleroma@coffee-and-dreams.uk>
Sat, 6 Jun 2020 17:20:10 +0000 (18:20 +0100)
commit780ac9cedb9a5df96bce763f586779c4297b0f0a
tree85b8de96708ac293b231a3418590fe5fad45602a
parent77caabba17d972d6f06bb9e62b295a25177bdb09
parentd74985af2381b1c0dae2bc9c79c14582e5c61b97
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
config/config.exs
lib/mix/tasks/pleroma/user.ex