Merge branch 'master' of https://github.com/owncloud/android into descendIntoFolder
authorAndy Scherzinger <info@andy-scherzinger.de>
Thu, 29 Oct 2015 08:40:44 +0000 (09:40 +0100)
committerAndy Scherzinger <info@andy-scherzinger.de>
Thu, 29 Oct 2015 08:40:44 +0000 (09:40 +0100)
commit4704e947da86120b055e6bea0c397f3e0efcbea2
treebec3a6b882af75153609ba1d6e33853456f22def
parent9815cc92c23bb198541b4a939bdcbe16a8f1cd2b
parent00c6d8bffe0908415558e37449e4d4b140da7b0a
Merge branch 'master' of https://github.com/owncloud/android into descendIntoFolder