gerrit.automotivelinux Code Review - src/xds/xds-server.git/commit

author	Sebastien Douheret <sebastien.douheret@iot.bzh>
	Fri, 17 Nov 2017 09:31:07 +0000 (10:31 +0100)
committer	Sebastien Douheret <sebastien.douheret@iot.bzh>
	Fri, 17 Nov 2017 09:31:07 +0000 (10:31 +0100)
commit	985b32b78da6e5ea008e45f6cf2df140df350ea9
tree	7c6c318b451da05fef732ff84d2b95d43660d0bd	tree \| snapshot
parent	72f3969eeb71af69b5d97381fd4789c0ba375296	commit \| diff
parent	8b800f6c9d862009684ce52d0007da08f46e748d	commit \| diff

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

Signed-off-by: Sebastien Douheret <sebastien.douheret@iot.bzh>
Conflicts:
Makefile
webapp/package.json