projects
/
pub
/
Android
/
ownCloud.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
62f34c8
7a3caaf
)
Merge branch 'beta' of github.com:owncloud/android into beta
author
tobiasKaminsky
<tobias@kaminsky.me>
Fri, 13 Nov 2015 16:52:18 +0000
(17:52 +0100)
committer
tobiasKaminsky
<tobias@kaminsky.me>
Fri, 13 Nov 2015 16:52:18 +0000
(17:52 +0100)
1
2
src/com/owncloud/android/ui/activity/Uploader.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
src/com/owncloud/android/ui/activity/Uploader.java
Simple merge
projects / pub / Android / ownCloud.git / commitdiff