From: Andy Scherzinger Date: Thu, 22 Oct 2015 11:05:06 +0000 (+0200) Subject: Merge branch 'master' of https://github.com/owncloud/android into material_buttons X-Git-Tag: beta-20151128~7^2~13 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/5c1e6e59bac614ce2b428f949e8ad09022b60080?hp=--cc Merge branch 'master' of https://github.com/owncloud/android into material_buttons --- 5c1e6e59bac614ce2b428f949e8ad09022b60080