From: Andy Scherzinger Date: Fri, 30 Oct 2015 13:20:53 +0000 (+0100) Subject: Merge branch 'master' of https://github.com/owncloud/android into material_fab X-Git-Tag: beta-20151202~3^2~9 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/d1fca6d9863b581cdf72829d43ad35f8a9bca79d Merge branch 'master' of https://github.com/owncloud/android into material_fab --- d1fca6d9863b581cdf72829d43ad35f8a9bca79d