Fabian Nonnenmacher 57e040aec1 Fixup merge conflict ...

Signed-off-by: Nonnenmacher Fabian <fabian.nonnenmacher@bosch-si.com>

2016-02-29 13:18:42 +01:00

..

main/java/org/eclipse/hawkbit

Fixup merge conflict

2016-02-29 13:18:42 +01:00

test/java/org/eclipse/hawkbit/eventbus

Remove swagger and minor feature extensions and bug fixes

2016-01-21 13:42:38 +01:00