projects
/
nextcloud-desktop.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
42aed56
cc91c42
)
Merge branch 'master' of https://github.com/owncloud/client into Kawohl-master
author
Jonathan Kawohl
<john@owncloud.com>
Wed, 23 Nov 2016 09:59:18 +0000
(10:59 +0100)
committer
Jonathan Kawohl
<john@owncloud.com>
Wed, 23 Nov 2016 09:59:18 +0000
(10:59 +0100)
fix conflict
Trivial merge
projects / nextcloud-desktop.git / commitdiff