projects
/
pub
/
Android
/
ownCloud.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
da4aaa5
3662fda
)
Merge branch 'share_link__new_share' into share_link__refresh_shares_folder_per_folder
author
David A. Velasco
<dvelasco@solidgear.es>
Thu, 6 Feb 2014 19:16:14 +0000
(20:16 +0100)
committer
David A. Velasco
<dvelasco@solidgear.es>
Thu, 6 Feb 2014 19:16:14 +0000
(20:16 +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