From: Andy Scherzinger Date: Tue, 15 Sep 2015 16:45:14 +0000 (+0200) Subject: Merge branch 'master' of https://github.com/owncloud/android into material_fab X-Git-Tag: beta-20151202~3^2~45 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/6ed679cc3f7402457a4b9618b43545c3c4bb7f82?ds=inline;hp=--cc Merge branch 'master' of https://github.com/owncloud/android into material_fab --- 6ed679cc3f7402457a4b9618b43545c3c4bb7f82