Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
authorsadposter <hannah+pleroma@coffee-and-dreams.uk>
Sat, 23 Jan 2021 22:38:07 +0000 (22:38 +0000)
committersadposter <hannah+pleroma@coffee-and-dreams.uk>
Sat, 23 Jan 2021 22:38:07 +0000 (22:38 +0000)
commit3aa25b008d145bc7bfda907bca3b327753380728
tree3264a9ec64b8ff3334f459f9ad81e9169af70f85
parent6cd0586ef9f1991655c7736479a9a1fb39f4098c
parent0a6f5f479348eff5f5404d4455fcb8254809812f
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
.gitignore
config/config.exs
lib/mix/tasks/pleroma/user.ex
lib/pleroma/web/endpoint.ex
lib/pleroma/web/nodeinfo/nodeinfo_controller.ex