projects
/
pub
/
Android
/
ownCloud.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
382191d
c7c53c9
)
Merge branch 'develop' of https://github.com/owncloud/android into multi2
author
Sam
<odeh_sam@hotmail.com>
Fri, 5 Dec 2014 09:07:48 +0000
(10:07 +0100)
committer
Sam
<odeh_sam@hotmail.com>
Fri, 5 Dec 2014 09:07:48 +0000
(10:07 +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
projects / pub / Android / ownCloud.git / commitdiff