From: Andy Scherzinger Date: Tue, 27 Oct 2015 13:00:52 +0000 (+0100) Subject: Merge branch 'master' of https://github.com/owncloud/android into material_fab X-Git-Tag: beta-20151202~3^2~19 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/477c7a6b0a7c6b8300db4e3bedd890eaba718124?ds=inline;hp=--cc Merge branch 'master' of https://github.com/owncloud/android into material_fab --- 477c7a6b0a7c6b8300db4e3bedd890eaba718124