From: Andy Scherzinger Date: Thu, 22 Oct 2015 11:03:53 +0000 (+0200) Subject: Merge branch 'master' of https://github.com/owncloud/android into material_fab X-Git-Tag: beta-20151202~3^2~24 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/426693b37d0c37c8d4de68ebb891108ac3a69603 Merge branch 'master' of https://github.com/owncloud/android into material_fab --- 426693b37d0c37c8d4de68ebb891108ac3a69603