Jonathan Philip Knoblauch 955a40dbaa Merge branch 'master' into Methods_only_called_by_inner_classes_should_move_to_those_classes ...

Conflicts:
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rollout/RolloutListGrid.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rolloutgroup/RolloutGroupListGrid.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rolloutgrouptargets/RolloutGroupTargetsListGrid.java


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

2016-04-05 17:44:36 +02:00

..

src

Merge branch 'master' into Methods_only_called_by_inner_classes_should_move_to_those_classes

2016-04-05 17:44:36 +02:00

.gitignore

Remove swagger and minor feature extensions and bug fixes

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

pom.xml

merged master

2016-03-06 09:26:53 +01:00