From: Andy Scherzinger Date: Sun, 22 Nov 2015 16:10:37 +0000 (+0100) Subject: Merge branch 'master' of https://github.com/owncloud/android into material_buttons X-Git-Tag: beta-20151128~7^2 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/ecdb95fa0cef923d76ce8d17b2d535247707466b?ds=inline Merge branch 'master' of https://github.com/owncloud/android into material_buttons --- ecdb95fa0cef923d76ce8d17b2d535247707466b