From: Andy Scherzinger Date: Mon, 19 Oct 2015 10:59:39 +0000 (+0200) Subject: Merge branch 'master' of https://github.com/owncloud/android into material_fab X-Git-Tag: beta-20151202~3^2~26 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/d0e73f432133bdbe3c46e12beff15059769eff37?ds=inline Merge branch 'master' of https://github.com/owncloud/android into material_fab --- d0e73f432133bdbe3c46e12beff15059769eff37