projects
/
pub
/
Android
/
ownCloud.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
c04d9c2
3b08f9f
)
Merge branch 'develop' into pinEnhancement
author
David A. Velasco
<dvelasco@solidgear.es>
Tue, 5 May 2015 11:43:01 +0000
(13:43 +0200)
committer
David A. Velasco
<dvelasco@solidgear.es>
Tue, 5 May 2015 11:43:01 +0000
(13:43 +0200)
1
2
src/com/owncloud/android/ui/activity/FileActivity.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
src/com/owncloud/android/ui/activity/FileActivity.java
Simple merge