Merge remote-tracking branch 'origin/2.1'
authorDaniel Molkentin <danimo@owncloud.com>
Tue, 26 Jan 2016 13:09:38 +0000 (14:09 +0100)
committerDaniel Molkentin <danimo@owncloud.com>
Tue, 26 Jan 2016 13:09:38 +0000 (14:09 +0100)
commitdd76d72d616d0fa8591273ca6356aa71375421d1
treea17b3fc474c74a0f7386d4b9fb6e8883095e1cd0
parent3b60f6e23877d831f6d4f762edb45bb0c560150b
parentba87178dee11de5217abc67cd4d4a590a52e3400
Merge remote-tracking branch 'origin/2.1'
csync/src/csync_update.c
src/gui/accountsettings.cpp
src/gui/share.cpp
src/gui/share.h
src/gui/socketapi.cpp