Merge branch 'master' into dev

author Dessalines <tyhou13@gmx.com>

Thu, 15 Aug 2019 21:22:19 +0000 (14:22 -0700)

committer Dessalines <tyhou13@gmx.com>

Thu, 15 Aug 2019 21:22:19 +0000 (14:22 -0700)
author Dessalines <tyhou13@gmx.com>
Thu, 15 Aug 2019 21:22:19 +0000 (14:22 -0700)
committer Dessalines <tyhou13@gmx.com>
Thu, 15 Aug 2019 21:22:19 +0000 (14:22 -0700)
diff --cc README.md
Simple merge
diff --cc ui/src/translations/en.ts
Simple merge
author	Dessalines <tyhou13@gmx.com>
	Thu, 15 Aug 2019 21:22:19 +0000 (14:22 -0700)
committer	Dessalines <tyhou13@gmx.com>
	Thu, 15 Aug 2019 21:22:19 +0000 (14:22 -0700)
		1	2
README.md	patch \|	diff1 \|	diff2 \|	blob \| history
ui/src/translations/en.ts	patch \|	diff1 \|	diff2 \|	blob \| history