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)
1  2 
config/config.exs
lib/mix/tasks/pleroma/user.ex
lib/pleroma/web/endpoint.ex

Simple merge
Simple merge
Simple merge