SirWayne 1b4d73bd13 Merge branch 'master' into feature_rollouts_credentials ...

Conflicts:
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/upload/UploadStatusObject.java


Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>

2016-06-15 09:53:06 +02:00

..

src

Merge branch 'master' into feature_rollouts_credentials

2016-06-15 09:53:06 +02:00

pom.xml

Split into separate maven modules.

2016-05-25 17:43:57 +02:00