projects
/
pub
/
Android
/
ownCloud.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
e3a61d2
759b5e3
)
Merge branch 'develop' into cancel_transfer_for_deleted_users
author
masensio
<masensio@solidgear.es>
Tue, 24 Feb 2015 13:19:41 +0000
(14:19 +0100)
committer
masensio
<masensio@solidgear.es>
Tue, 24 Feb 2015 13:19:41 +0000
(14:19 +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