Merge remote-tracking branch 'eclipse/master' into feature_MECS-86_tenant_specific_polling_configuration

# Conflicts:
#
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/Tena
ntConfigurationDashboardView.java
This commit is contained in:
Kai Zimmermann
2016-03-14 09:51:00 +01:00
40 changed files with 667 additions and 439 deletions

View File

@@ -1,2 +1,3 @@
/target/
/bin/
/.apt_generated/