projects
/
pub
/
Android
/
ownCloud.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
1a6319e
0a0c808
)
Merged with owncloud develop
author
Sam
<odeh_sam@hotmail.com>
Wed, 3 Dec 2014 09:04:39 +0000
(10:04 +0100)
committer
Sam
<odeh_sam@hotmail.com>
Wed, 3 Dec 2014 09:04:39 +0000
(10:04 +0100)
1
2
src/com/owncloud/android/ui/activity/FileDisplayActivity.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
src/com/owncloud/android/ui/activity/FileDisplayActivity.java
Simple merge