]> source.dussan.org Git - nextcloud-server.git/commit
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)
commitc91515cfedc678b9de24ae981573216478cddf27
treec825980a4575bf6e61067a2e6888c2e55900e0b4
parent69e61b2892ce7e9def576e1a9581f00df2369a59
parentfe6b4d432b5b3232fe3dd9c928d9c0efdba3d3be
Merge pull request #6847 from nextcloud/filelist-confict-path-12

[12] still trigger conflict resolution for existing entries when the curreā€¦