Merge branch 'release/1.4.0' into develop

author Chocobozzz <me@florianbigard.com>

Wed, 11 Sep 2019 09:09:18 +0000 (11:09 +0200)

committer Chocobozzz <me@florianbigard.com>

Wed, 11 Sep 2019 09:09:18 +0000 (11:09 +0200)
author Chocobozzz <me@florianbigard.com>
Wed, 11 Sep 2019 09:09:18 +0000 (11:09 +0200)
committer Chocobozzz <me@florianbigard.com>
Wed, 11 Sep 2019 09:09:18 +0000 (11:09 +0200)
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>
	Wed, 11 Sep 2019 09:09:18 +0000 (11:09 +0200)
committer	Chocobozzz <me@florianbigard.com>
	Wed, 11 Sep 2019 09:09:18 +0000 (11:09 +0200)
		1	2
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