Merge branch '2.0'
authorChristian Kamm <mail@ckamm.de>
Fri, 2 Oct 2015 13:44:50 +0000 (15:44 +0200)
committerChristian Kamm <mail@ckamm.de>
Fri, 2 Oct 2015 13:44:50 +0000 (15:44 +0200)
commitefefc2d986360d082247cc2e517aa6102e512c5a
treee9fc3547db31cb735750dcf4e06d81be2c621897
parent9f8d109a7ec3363a38a5b3f96a8ff87029fd2090
parent3cbd63a77a3b09c06f10ffb459b8966b14af4bab
Merge branch '2.0'

Conflicts:
doc/images/menu.png
doc/images/settings_network.png
13 files changed:
src/cmd/cmd.cpp
src/gui/accountsettings.cpp
src/gui/accountsettings.h
src/gui/accountsettings.ui
src/gui/accountstate.cpp
src/gui/application.cpp
src/libsync/account.cpp
src/libsync/account.h
src/libsync/connectionvalidator.cpp
src/libsync/owncloudpropagator.cpp
src/libsync/owncloudpropagator.h
src/libsync/syncengine.cpp
src/libsync/utility.cpp