Merge branch 'Feature/Add_Rest_Api_with_Java_client' of

https://github.com/bsinno/hawkbit.git into
Feature/Add_Rest_Api_with_Java_client

Conflicts:
	README.md


Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
This commit is contained in:
SirWayne
2016-05-17 16:13:42 +02:00
2 changed files with 21 additions and 20 deletions

View File

@@ -1,4 +1,3 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 2015 Bosch Software Innovations GmbH and others.