Merge remote-tracking branch 'origin/avatar_pics'
authorOlivier Goffart <ogoffart@woboq.com>
Thu, 13 Apr 2017 09:40:27 +0000 (11:40 +0200)
committerOlivier Goffart <ogoffart@woboq.com>
Thu, 13 Apr 2017 09:54:28 +0000 (11:54 +0200)
commit8cb3a77022dfc8c688e3aeaf9fb08b6ddd305521
treefe56af41a635e01b78706b0dc4623cf91667704d
parent1ed4eb46f20793b7f0742f4c058f6ce20de9515a
parent554d1b88fc46d07ebe6be6315d0830b013e84296
Merge remote-tracking branch 'origin/avatar_pics'

Also fix compilation because of 22370fdbdadd06f0cacd249a8d7a32f0d3c1374e

Pull request #5482
src/gui/settingsdialog.cpp
src/libsync/account.cpp
src/libsync/account.h
src/libsync/connectionvalidator.cpp
src/libsync/networkjobs.cpp
src/libsync/networkjobs.h