Merge branch 'release/2.1.0' into develop

author Chocobozzz <me@florianbigard.com>

Thu, 20 Feb 2020 09:43:33 +0000 (10:43 +0100)

committer Chocobozzz <me@florianbigard.com>

Thu, 20 Feb 2020 09:43:33 +0000 (10:43 +0100)
author Chocobozzz <me@florianbigard.com>
Thu, 20 Feb 2020 09:43:33 +0000 (10:43 +0100)
committer Chocobozzz <me@florianbigard.com>
Thu, 20 Feb 2020 09:43:33 +0000 (10:43 +0100)
diff --cc client/src/app/menu/menu.component.scss
Simple merge
diff --cc server/controllers/client.ts
Simple merge
author	Chocobozzz <me@florianbigard.com>
	Thu, 20 Feb 2020 09:43:33 +0000 (10:43 +0100)
committer	Chocobozzz <me@florianbigard.com>
	Thu, 20 Feb 2020 09:43:33 +0000 (10:43 +0100)
		1	2
client/src/app/menu/menu.component.scss	patch \|	diff1 \|	diff2 \|	blob \| history
server/controllers/client.ts	patch \|	diff1 \|	diff2 \|	blob \| history