projects
/
pub
/
Android
/
ownCloud.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
a070742
ae0e116
)
Merge branch 'text_file_preview_pr_707_with_develop' of github.com:owncloud/android...
author
masensio
<masensio@solidgear.es>
Wed, 2 Sep 2015 11:29:14 +0000
(13:29 +0200)
committer
masensio
<masensio@solidgear.es>
Wed, 2 Sep 2015 11:29:14 +0000
(13:29 +0200)
1
2
src/com/owncloud/android/datamodel/OCFile.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
src/com/owncloud/android/datamodel/OCFile.java
Simple merge
projects / pub / Android / ownCloud.git / commitdiff