projects
/
pub
/
Android
/
ownCloud.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
c9b6394
a6589ab
)
Merge branch 'share_link_show_shared_files' into bug_in_refresh_of_shared_state_when_...
author
David A. Velasco
<dvelasco@solidgear.es>
Thu, 30 Jan 2014 17:33:45 +0000
(18:33 +0100)
committer
David A. Velasco
<dvelasco@solidgear.es>
Thu, 30 Jan 2014 17:33:45 +0000
(18:33 +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