Merge branch 'release/2.1.0' into develop

author Chocobozzz <me@florianbigard.com>

Tue, 11 Feb 2020 08:44:59 +0000 (09:44 +0100)

committer Chocobozzz <me@florianbigard.com>

Tue, 11 Feb 2020 08:44:59 +0000 (09:44 +0100)
author Chocobozzz <me@florianbigard.com>
Tue, 11 Feb 2020 08:44:59 +0000 (09:44 +0100)
committer Chocobozzz <me@florianbigard.com>
Tue, 11 Feb 2020 08:44:59 +0000 (09:44 +0100)
diff --cc CHANGELOG.md
Simple merge
diff --cc client/package.json
Simple merge
diff --cc package.json
Simple merge
diff --cc support/doc/api/openapi.yaml
Simple merge
author	Chocobozzz <me@florianbigard.com>
	Tue, 11 Feb 2020 08:44:59 +0000 (09:44 +0100)
committer	Chocobozzz <me@florianbigard.com>
	Tue, 11 Feb 2020 08:44:59 +0000 (09:44 +0100)
		1	2
CHANGELOG.md	patch \|	diff1 \|	diff2 \|	blob \| history
client/package.json	patch \|	diff1 \|	diff2 \|	blob \| history
package.json	patch \|	diff1 \|	diff2 \|	blob \| history
support/doc/api/openapi.yaml	patch \|	diff1 \|	diff2 \|	blob \| history