Kevin Ottens e3b97b0a04 In the case of conflicts, have the socket api propose the config dialog ... This should be safe in the case of conflicts in folders on which the user can write. For other cases we still use the older actions. Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>		2020-10-22 16:40:46 +02:00
..
3rdparty	Enable bugprone-narrowing-conversions clang-tidy check	2020-09-01 06:37:03 +00:00
cmd	cmd: Replace foreach with range base for (#2219)	2020-09-29 19:31:23 +02:00
common	SocketAPI: Introduce conflict resolution actions #6252	2020-10-22 16:40:10 +02:00
crashreporter	macOS: Use macdeployqt instead of the old admin/osx/macdeployqt.py	2020-06-07 14:39:42 +02:00
csync	Enable bugprone-macro-parentheses clang-tidy check	2020-09-01 06:37:03 +00:00
gui	In the case of conflicts, have the socket api propose the config dialog	2020-10-22 16:40:46 +02:00
libsync	SocketAPI: Introduce conflict resolution actions #6252	2020-10-22 16:40:10 +02:00
CMakeLists.txt	Windows: Enable CFG and SafeSEH linker security flags	2020-08-03 10:11:33 +02:00