Merge branch 'main' of https://github.com/lemmynet/lemmy into main

author Dessalines <tyhou13@gmx.com>

Mon, 2 Nov 2020 03:26:36 +0000 (21:26 -0600)

committer Dessalines <tyhou13@gmx.com>

Mon, 2 Nov 2020 03:26:36 +0000 (21:26 -0600)
author Dessalines <tyhou13@gmx.com>
Mon, 2 Nov 2020 03:26:36 +0000 (21:26 -0600)
committer Dessalines <tyhou13@gmx.com>
Mon, 2 Nov 2020 03:26:36 +0000 (21:26 -0600)
diff --cc lemmy_utils/src/settings.rs
Simple merge
author	Dessalines <tyhou13@gmx.com>
	Mon, 2 Nov 2020 03:26:36 +0000 (21:26 -0600)
committer	Dessalines <tyhou13@gmx.com>
	Mon, 2 Nov 2020 03:26:36 +0000 (21:26 -0600)