From: Andy Scherzinger Date: Mon, 26 Oct 2015 12:56:35 +0000 (+0100) Subject: Merge branch 'master' of https://github.com/owncloud/android into material_fab X-Git-Tag: beta-20151202~3^2~23 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/707a7fb823c99eca6e52cc09ef051368812ed3ab?ds=inline;hp=--cc Merge branch 'master' of https://github.com/owncloud/android into material_fab --- 707a7fb823c99eca6e52cc09ef051368812ed3ab