From: Andy Scherzinger Date: Sun, 6 Sep 2015 18:49:49 +0000 (+0200) Subject: Merge branch 'master' of https://github.com/owncloud/android into material_buttons X-Git-Tag: beta-20151128~7^2~35 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/c1e73ec56f341a26d480c5ffe231d871bee1a86d Merge branch 'master' of https://github.com/owncloud/android into material_buttons --- c1e73ec56f341a26d480c5ffe231d871bee1a86d