Merge pull request #96 from symant233/dev

author Ricter Zheng <RicterZheng@gmail.com>

Mon, 16 Dec 2019 02:41:53 +0000 (10:41 +0800)

committer GitHub <noreply@github.com>

Mon, 16 Dec 2019 02:41:53 +0000 (10:41 +0800)
author Ricter Zheng <RicterZheng@gmail.com>
Mon, 16 Dec 2019 02:41:53 +0000 (10:41 +0800)
committer GitHub <noreply@github.com>
Mon, 16 Dec 2019 02:41:53 +0000 (10:41 +0800)
diff --cc README.rst
Simple merge
diff --cc nhentai/viewer/styles.css
Simple merge
author	Ricter Zheng <RicterZheng@gmail.com>
	Mon, 16 Dec 2019 02:41:53 +0000 (10:41 +0800)
committer	GitHub <noreply@github.com>
	Mon, 16 Dec 2019 02:41:53 +0000 (10:41 +0800)
		1	2
README.rst	patch \|	diff1 \|	diff2 \|	blob \| history
nhentai/viewer/styles.css	patch \|	diff1 \|	diff2 \|	blob \| history