projects
/
nextcloud-desktop.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
0fde7f0
4d7fde5
)
Merge remote-tracking branch 'origin/2.0'
author
Olivier Goffart
<ogoffart@woboq.com>
Thu, 29 Oct 2015 11:44:28 +0000
(12:44 +0100)
committer
Olivier Goffart
<ogoffart@woboq.com>
Thu, 29 Oct 2015 11:44:28 +0000
(12:44 +0100)
1
2
ChangeLog
patch
|
diff1
|
diff2
|
blob
|
history
src/cmd/cmd.cpp
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
ChangeLog
Simple merge
diff --cc
src/cmd/cmd.cpp
Simple merge