From: Andy Scherzinger Date: Mon, 10 Aug 2015 08:54:05 +0000 (+0200) Subject: Merge branch 'master' of https://github.com/owncloud/android into material_buttons X-Git-Tag: beta-20151128~7^2~72 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/6a22a8cd3be7ea0f9670562249b9456c3cc97a9e?hp=--cc Merge branch 'master' of https://github.com/owncloud/android into material_buttons --- 6a22a8cd3be7ea0f9670562249b9456c3cc97a9e