From: Andy Scherzinger Date: Fri, 16 Oct 2015 08:41:02 +0000 (+0200) Subject: Merge branch 'master' of https://github.com/owncloud/android into material_fab X-Git-Tag: beta-20151202~3^2~28 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/8586416423ccffc7d779b0bb24a3e8b26e83ea2b?ds=inline;hp=--cc Merge branch 'master' of https://github.com/owncloud/android into material_fab --- 8586416423ccffc7d779b0bb24a3e8b26e83ea2b