projects
/
pub
/
Android
/
ownCloud.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
9ea3f77
0c7a9c3
)
Merge branch 'develop' of github.com:owncloud/android into svgTransparentBackground
author
tobiasKaminsky
<tobias@kaminsky.me>
Fri, 21 Aug 2015 15:48:58 +0000
(17:48 +0200)
committer
tobiasKaminsky
<tobias@kaminsky.me>
Fri, 21 Aug 2015 15:48:58 +0000
(17:48 +0200)
1
2
src/com/owncloud/android/ui/adapter/FileListListAdapter.java
patch
|
diff1
|
diff2
|
blob
|
history
src/com/owncloud/android/ui/preview/PreviewImageFragment.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
src/com/owncloud/android/ui/adapter/FileListListAdapter.java
Simple merge
diff --cc
src/com/owncloud/android/ui/preview/PreviewImageFragment.java
Simple merge