Asharani f06cfa46f2 Merge branch 'master' into feature_minimize_status_popup ...

Conflicts:
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/upload/UploadConfirmationwindow.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/grid/AbstractGridLayout.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/utils/SPUIComponetIdProvider.java

2016-06-02 15:41:16 +05:30

..

themes/hawkbit

Merge branch 'master' into feature_minimize_status_popup

2016-06-02 15:41:16 +05:30

.gitignore

Remove swagger and minor feature extensions and bug fixes

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