Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop

author sadposter <hannah+pleroma@coffee-and-dreams.uk>

Sat, 23 Jan 2021 22:38:07 +0000 (22:38 +0000)

committer sadposter <hannah+pleroma@coffee-and-dreams.uk>

Sat, 23 Jan 2021 22:38:07 +0000 (22:38 +0000)
author sadposter <hannah+pleroma@coffee-and-dreams.uk>
Sat, 23 Jan 2021 22:38:07 +0000 (22:38 +0000)
committer sadposter <hannah+pleroma@coffee-and-dreams.uk>
Sat, 23 Jan 2021 22:38:07 +0000 (22:38 +0000)
diff --cc .gitignore
Simple merge
diff --cc config/config.exs
Simple merge
diff --cc lib/mix/tasks/pleroma/user.ex
Simple merge
diff --cc lib/pleroma/web/endpoint.ex
Simple merge
diff --cc lib/pleroma/web/nodeinfo/nodeinfo_controller.ex
Simple merge
author	sadposter <hannah+pleroma@coffee-and-dreams.uk>
	Sat, 23 Jan 2021 22:38:07 +0000 (22:38 +0000)
committer	sadposter <hannah+pleroma@coffee-and-dreams.uk>
	Sat, 23 Jan 2021 22:38:07 +0000 (22:38 +0000)
		1	2
.gitignore	patch \|	diff1 \|	diff2 \|	blob \| history
config/config.exs	patch \|	diff1 \|	diff2 \|	blob \| history
lib/mix/tasks/pleroma/user.ex	patch \|	diff1 \|	diff2 \|	blob \| history
lib/pleroma/web/endpoint.ex	patch \|	diff1 \|	diff2 \|	blob \| history
lib/pleroma/web/nodeinfo/nodeinfo_controller.ex	patch \|	diff1 \|	diff2 \|	blob \| history