]> source.dussan.org Git - nextcloud-server.git/commit
projects / nextcloud-server.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 70e2072) | patch
still trigger conflict resolution for existing entries when the current entry doesn...
authorRobin Appelman <robin@icewind.nl>
Mon, 16 Oct 2017 14:15:15 +0000 (16:15 +0200)
committerMorris Jobke <hey@morrisjobke.de>
Tue, 7 Nov 2017 14:54:07 +0000 (15:54 +0100)
commite51acfc717bd55e48eba0d886b14becbbe323b8a
treeef6de02dc4adb354ee88dd5bab1b7189bab74ad5tree | snapshot
parent70e20727e5dc69a7bc9ac67708ebb6bafe17a712commit | diff
still trigger conflict resolution for existing entries when the current entry doesn't need it

Signed-off-by: Robin Appelman <robin@icewind.nl>
apps/files/js/filelist.js diff | blob | history
Nextcloud server, a safe home for all your data: https://github.com/nextcloud/server