Commits

Katja Marttila committed 776c09b3307M
Merge remote-tracking branch 'origin/2.0' into 3.0 Conflicts: src/libs/installer/downloadfiletask.cpp src/sdk/translations/ru.ts Change-Id: Ibce8b9592c98cec5af3521f4ae6f850c2b8f45ac
Merge remote-tracking branch 'origin/2.0' into 3.0 Conflicts: src/libs/installer/downloadfiletask.cpp src/sdk/translations/ru.ts Change-Id: Ibce8b9592c98cec5af3521f4ae6f850c2b8f45ac