From: Andy Scherzinger Date: Sun, 13 Sep 2015 19:17:38 +0000 (+0200) Subject: Merge branch 'master' of https://github.com/owncloud/android into material_fab X-Git-Tag: beta-20151202~3^2~48 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/728590437134a90aede2bb9b641268fd0f467897 Merge branch 'master' of https://github.com/owncloud/android into material_fab --- 728590437134a90aede2bb9b641268fd0f467897