Merge branch 'master' into linux_restart_on_new_version
authorDaniel Molkentin <danimo@owncloud.com>
Thu, 6 Aug 2015 09:11:52 +0000 (11:11 +0200)
committerDaniel Molkentin <danimo@owncloud.com>
Thu, 6 Aug 2015 09:11:52 +0000 (11:11 +0200)
commit72b2c52e15a5f0b0d901b82d07fe2935790d4ee6
treee4c6ef559b22fa895a4675ebc414051572092f15
parent2a22cec442d29b20e74b7de9dfd530ac26064cc9
parent6e32c2c14ed692d58694b33344ff6ee6e3f93b29
Merge branch 'master' into linux_restart_on_new_version

Conflicts:
src/gui/application.cpp
src/gui/owncloudsetupwizard.cpp
src/gui/application.cpp
src/gui/application.h
src/gui/folderman.cpp
src/gui/folderman.h
src/gui/main.cpp
src/libsync/utility.cpp
test/CMakeLists.txt
test/testutility.h