projects
/
pub
/
Android
/
ownCloud.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from:
a070742
)
Merge remote-tracking branch 'origin/master' into text_file_preview_pr_707_with_develop
author
masensio
<masensio@solidgear.es>
Wed, 2 Sep 2015 11:21:17 +0000
(13:21 +0200)
committer
masensio
<masensio@solidgear.es>
Wed, 2 Sep 2015 11:23:42 +0000
(13:23 +0200)
Conflicts:
res/layout/file_preview.xml
src/com/owncloud/android/ui/activity/FileDisplayActivity.java
No differences found
projects / pub / Android / ownCloud.git / commitdiff