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)
commitc7bf09c3d47323026a96bc83cedde8f34e9e8acf
tree27bcb747693a55012935dc071bbaa753b704233e
parentc80e72da83978fa8d200e9ee34c4f4008062d2ba
parentc8ae54d9e877cc78bef277c90b7794f8eab5366c
Merge remote-tracking branch 'origin/2.0'
src/libsync/theme.cpp