From: Andy Scherzinger Date: Thu, 29 Oct 2015 08:40:44 +0000 (+0100) Subject: Merge branch 'master' of https://github.com/owncloud/android into descendIntoFolder X-Git-Tag: beta-20151122~26^2~1 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/4704e947da86120b055e6bea0c397f3e0efcbea2 Merge branch 'master' of https://github.com/owncloud/android into descendIntoFolder --- 4704e947da86120b055e6bea0c397f3e0efcbea2