Merge branch 'descendIntoFolder' of https://github.com/owncloud/android into descendI...
authorAndy Scherzinger <info@andy-scherzinger.de>
Thu, 29 Oct 2015 08:42:06 +0000 (09:42 +0100)
committerAndy Scherzinger <info@andy-scherzinger.de>
Thu, 29 Oct 2015 08:42:06 +0000 (09:42 +0100)
commita9de27f1fa821f17ee5c9eed298a13f0947d0e3a
treebec3a6b882af75153609ba1d6e33853456f22def
parent4704e947da86120b055e6bea0c397f3e0efcbea2
parente967f936b06ddad35aaabf5e6684ef326f54c9e4
Merge branch 'descendIntoFolder' of https://github.com/owncloud/android into descendIntoFolder