Merge remote-tracking branch 'remotes/upstream/descendIntoFolder' into beta
authortobiasKaminsky <tobias@kaminsky.me>
Fri, 13 Nov 2015 16:41:49 +0000 (17:41 +0100)
committertobiasKaminsky <tobias@kaminsky.me>
Fri, 13 Nov 2015 16:41:49 +0000 (17:41 +0100)
commit423b208d68690f482c735f16ad73f721506e7c8b
treeae89f7bb8e8e2e98fc75f9ae3a6748bc8bd7d615
parent7d6a3630aebda914cd053b3c6f577ac4cb69ef7a
parenta9de27f1fa821f17ee5c9eed298a13f0947d0e3a
Merge remote-tracking branch 'remotes/upstream/descendIntoFolder' into beta
src/com/owncloud/android/ui/activity/Uploader.java