From: Andy Scherzinger Date: Fri, 11 Sep 2015 10:47:01 +0000 (+0200) Subject: Merge branch 'master' of https://github.com/owncloud/android into material_buttons X-Git-Tag: beta-20151128~7^2~31 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/13a73dd56872b6fcbc12ab8c62806cbfd48dc93b Merge branch 'master' of https://github.com/owncloud/android into material_buttons --- 13a73dd56872b6fcbc12ab8c62806cbfd48dc93b