Conflicts: src/gui/owncloudsetupwizard.cpp src/gui/owncloudsetupwizard.h src/libsync/propagatedownload.cpp src/libsync/propagatedownload.h