Jonathan Philip Knoblauch 7cae6f877d 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:
	hawkbit-autoconfigure/src/main/java/org/eclipse/hawkbit/autoconfigure/web/ResourceControllerAutoConfiguration.java


Signed-off-by: Jonathan Philip Knoblauch <JonathanPhilip.Knoblauch@bosch-si.com>

2016-04-22 18:19:20 +02:00

..

src/main

Merge branch 'Feature/Add_Rest_Api_with_Java_client' of https://github.com/bsinno/hawkbit.git into Feature/Add_Rest_Api_with_Java_client

2016-04-22 18:19:20 +02:00

pom.xml

Rename and split rest resources ddi, mgmt and system

2016-04-20 17:33:03 +02:00