From: Andy Scherzinger Date: Fri, 11 Sep 2015 10:46:48 +0000 (+0200) Subject: Merge branch 'master' of https://github.com/owncloud/android into material_fab X-Git-Tag: beta-20151202~3^2~54 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/bee2bdff630dbe62e83481f931e4d5b6b5b81571 Merge branch 'master' of https://github.com/owncloud/android into material_fab --- bee2bdff630dbe62e83481f931e4d5b6b5b81571