From: Andy Scherzinger Date: Sun, 11 Oct 2015 10:30:05 +0000 (+0200) Subject: Merge branch 'master' of https://github.com/owncloud/android into material_buttons X-Git-Tag: beta-20151128~7^2~17 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/e5a61893ecb2b65f7a52651c01a34bdbd8d14416 Merge branch 'master' of https://github.com/owncloud/android into material_buttons --- e5a61893ecb2b65f7a52651c01a34bdbd8d14416