Merge pull request #1169 from LemmyNet/new_default_theme

author Nutomic <me@nutomic.com>

Mon, 5 Oct 2020 15:47:26 +0000 (15:47 +0000)

committer GitHub <noreply@github.com>

Mon, 5 Oct 2020 15:47:26 +0000 (15:47 +0000)
author Nutomic <me@nutomic.com>
Mon, 5 Oct 2020 15:47:26 +0000 (15:47 +0000)
committer GitHub <noreply@github.com>
Mon, 5 Oct 2020 15:47:26 +0000 (15:47 +0000)
diff --cc lemmy_db/src/community.rs
Simple merge
diff --cc lemmy_db/src/user.rs
Simple merge
author	Nutomic <me@nutomic.com>
	Mon, 5 Oct 2020 15:47:26 +0000 (15:47 +0000)
committer	GitHub <noreply@github.com>
	Mon, 5 Oct 2020 15:47:26 +0000 (15:47 +0000)
		1	2
lemmy_db/src/community.rs	patch \|	diff1 \|	diff2 \|	blob \| history
lemmy_db/src/user.rs	patch \|	diff1 \|	diff2 \|	blob \| history