Learn more about cloning repositories
You have read-only access
Merge remote-tracking branch 'origin/2.0' into 3.0 Conflicts: src/libs/installer/downloadfiletask.cpp Change-Id: Ie4b07c402a63c7a12ecf24e52e197507bbb2c5df
