Merge branch 'master' into

Browse Source

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>

...

This commit is contained in:

Michael Hirsch

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

parent ef38712729 50c9141f77

commit df1d4c5a20

230 changed files with 3626 additions and 5973 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

BIN

hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/images/profile-pic-300px.jpg

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 1.8 KiB