projects
/
pub
/
Android
/
ownCloud.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
70e239f
5bab662
)
Merge pull request #345 from owncloud/fix_pincode_in_instant_uploads
author
David A. Velasco
<dvelasco@owncloud.com>
Wed, 8 Jan 2014 17:12:06 +0000
(09:12 -0800)
committer
David A. Velasco
<dvelasco@owncloud.com>
Wed, 8 Jan 2014 17:12:06 +0000
(09:12 -0800)
Fixed pincode request in instant uploads
1
2
src/com/owncloud/android/files/services/FileUploader.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
src/com/owncloud/android/files/services/FileUploader.java
Simple merge