Merge remote-tracking branch 'origin/2.0'
authorDaniel Molkentin <danimo@owncloud.com>
Wed, 21 Oct 2015 16:49:58 +0000 (18:49 +0200)
committerDaniel Molkentin <danimo@owncloud.com>
Wed, 21 Oct 2015 16:49:58 +0000 (18:49 +0200)
1  2 
src/libsync/theme.cpp

Simple merge