projects
/
pub
/
Android
/
ownCloud.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(from:
ed763a6
)
Merge remote-tracking branch 'remotes/upstream/master' into switchListVsGridMaster
author
tobiasKaminsky
<tobias@kaminsky.me>
Thu, 29 Oct 2015 17:02:00 +0000
(18:02 +0100)
committer
tobiasKaminsky
<tobias@kaminsky.me>
Thu, 29 Oct 2015 17:02:00 +0000
(18:02 +0100)
# Conflicts:
# res/menu/file_actions_menu.xml
# src/com/owncloud/android/ui/fragment/OCFileListFragment.java
# src/com/owncloud/android/utils/DisplayUtils.java
No differences found
projects / pub / Android / ownCloud.git / commitdiff