From: Sebastien Douheret <sebastien.douheret@iot.bzh>
Date: Fri, 17 Nov 2017 09:31:07 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/master' into wip
X-Git-Tag: v1.0.0-rc1~12
X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?p=src%2Fxds%2Fxds-server.git;a=commitdiff_plain;h=985b32b78da6e5ea008e45f6cf2df140df350ea9

Merge remote-tracking branch 'origin/master' into wip

Signed-off-by: Sebastien Douheret <sebastien.douheret@iot.bzh>

Conflicts:
	Makefile
	webapp/package.json
---

985b32b78da6e5ea008e45f6cf2df140df350ea9