mirror of
https://github.com/nextcloud/desktop.git
synced 2024-12-16 10:41:34 +03:00
53d5de685c
Conflicts: src/gui/folder.cpp src/gui/folder.h src/libsync/networkjobs.cpp src/libsync/owncloudpropagator.h src/libsync/propagatedownload.cpp |
||
---|---|---|
.. | ||
manual/favlink | ||
scripts | ||
CMakeLists.txt | ||
main.cpp.in | ||
owncloud_add_test.cmake | ||
test_journal.db | ||
testcsyncsqlite.h | ||
testfolder.h | ||
testfolderwatcher.h | ||
testinotifywatcher.h | ||
testnetrcparser.h | ||
testowncloudpropagator.h | ||
testownsql.h | ||
testplan.txt | ||
testsyncjournaldb.h | ||
testupdater.h | ||
testutility.h |