Michael Hirsch df1d4c5a20 Merge branch 'master' into ...

Download_server_supports_download_through_HTTP_and_HTTPs

Conflicts:
	hawkbit-core/src/main/java/org/eclipse/hawkbit/tenancy/configuration/TenantConfigurationKey.java


Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>

2016-04-05 11:58:27 +02:00

..

src/main

Merge branch 'master' into

2016-04-05 11:58:27 +02:00

pom.xml

Completed migration to ConfigurationProperties annotation. Added boot metadata generation to build.

2016-02-25 17:59:46 +01:00