Simon Pasquier d6d5154a39 Merge remote-tracking branch 'upstream/master' into merge-branch ... Conflicts: metadata/service/support.yml Change-Id: Icc8a1c0085cac1209b333cfad40917d57edafcf9		2016-11-18 11:46:59 +01:00
..
client	Initial commit	2015-10-06 16:40:56 +02:00
server	add support for config generation	2016-10-05 19:55:22 +02:00
support.yml	Merge remote-tracking branch 'upstream/master' into merge-branch	2016-11-18 11:46:59 +01:00