From: Andy Scherzinger Date: Fri, 7 Aug 2015 15:11:04 +0000 (+0200) Subject: Merge branch 'master' of https://github.com/owncloud/android into material_buttons X-Git-Tag: beta-20151128~7^2~76 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/bbfb414695f57029033d01bf4d26e2c9dcef54a5?ds=inline;hp=-c Merge branch 'master' of https://github.com/owncloud/android into material_buttons --- bbfb414695f57029033d01bf4d26e2c9dcef54a5