]> source.dussan.org Git - nextcloud-server.git/commitdiff
projects / nextcloud-server.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 69e61b2 fe6b4d4)
Merge pull request #6847 from nextcloud/filelist-confict-path-12
authorMorris Jobke <hey@morrisjobke.de>
Thu, 9 Nov 2017 08:34:24 +0000 (09:34 +0100)
committerGitHub <noreply@github.com>
Thu, 9 Nov 2017 08:34:24 +0000 (09:34 +0100)
[12] still trigger conflict resolution for existing entries when the curre…


Trivial merge
Nextcloud server, a safe home for all your data: https://github.com/nextcloud/server