projects
/
pub
/
Android
/
ownCloud.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
aaba7b2
0641afc
)
Merge branch 'develop' into send_file_pr311_with_develop
author
masensio
<masensio@solidgear.es>
Thu, 27 Feb 2014 07:40:17 +0000
(08:40 +0100)
committer
masensio
<masensio@solidgear.es>
Thu, 27 Feb 2014 07:40:17 +0000
(08:40 +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