Merge branch 'master' of https://github.com/makigi-io/makigi into makigi-io-master

author Dessalines <tyhou13@gmx.com>

Mon, 22 Jun 2020 18:52:46 +0000 (14:52 -0400)

committer Dessalines <tyhou13@gmx.com>

Mon, 22 Jun 2020 18:52:46 +0000 (14:52 -0400)
author Dessalines <tyhou13@gmx.com>
Mon, 22 Jun 2020 18:52:46 +0000 (14:52 -0400)
committer Dessalines <tyhou13@gmx.com>
Mon, 22 Jun 2020 18:52:46 +0000 (14:52 -0400)
diff --cc server/src/lib.rs
Simple merge
diff --cc ui/translations/en.json
Simple merge
author	Dessalines <tyhou13@gmx.com>
	Mon, 22 Jun 2020 18:52:46 +0000 (14:52 -0400)
committer	Dessalines <tyhou13@gmx.com>
	Mon, 22 Jun 2020 18:52:46 +0000 (14:52 -0400)
		1	2
server/src/lib.rs	patch \|	diff1 \|	diff2 \|	blob \| history
ui/translations/en.json	patch \|	diff1 \|	diff2 \|	blob \| history