Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
authorsadposter <hannah+pleroma@coffee-and-dreams.uk>
Sat, 20 Feb 2021 15:27:56 +0000 (15:27 +0000)
committersadposter <hannah+pleroma@coffee-and-dreams.uk>
Sat, 20 Feb 2021 15:27:56 +0000 (15:27 +0000)
commit5f336991699c8cc22814e8dae5ec1636cc93bea6
treec27a51c6bdcb9642b6cf9350d97e11e746d845d8
parent3aa25b008d145bc7bfda907bca3b327753380728
parent8829a408ecf3bfffaf59af415817220fd63a81b7
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
config/config.exs
lib/mix/tasks/pleroma/user.ex
lib/pleroma/web/endpoint.ex