Christian Kamm 2cac928810 Conflicts: Upload them files if env variable says so ... Set OWNCLOUD_UPLOAD_CONFLICT_FILES=1 to trigger this behavior. Note that this is experimental and unsupported. The real feature is likely to end up in 2.5. Uploading conflict files is simply done by removing the pattern from csync_exclude. The rest here deals with making the conflict notification ui approximately work. There are still some concerns about where an uploaded conflict file appears in the sync protocol and issues list (it should be in both, but is only in one of them currently!). See #4557.		2017-10-05 22:01:34 +02:00
..
3rdparty	Remove qtkeychain submodule #6004	2017-10-05 22:01:04 +02:00
cmd	Move SyncJournalDB to src/common	2017-10-05 22:01:33 +02:00
common	Conflicts: Upload them files if env variable says so	2017-10-05 22:01:34 +02:00
crashreporter	Apply clang-format	2017-05-17 12:26:27 +02:00
csync	Conflicts: Upload them files if env variable says so	2017-10-05 22:01:34 +02:00
gui	Private links: Retrieve link through propfind property #6020	2017-10-05 22:01:34 +02:00
libsync	Conflicts: Upload them files if env variable says so	2017-10-05 22:01:34 +02:00
CMakeLists.txt	Enable DEP & ASLR on Windows	2017-10-05 22:01:04 +02:00