mirror of
https://github.com/nextcloud/desktop.git
synced 2024-11-22 21:15:55 +03:00
902bb7a198
Conflicts: src/CMakeLists.txt src/gui/accountsettings.cpp src/gui/folderwizard.cpp src/gui/settingsdialog.cpp src/libsync/syncengine.h |
||
---|---|---|
.. | ||
manual/favlink | ||
scripts | ||
CMakeLists.txt | ||
main.cpp.in | ||
owncloud_add_test.cmake | ||
test_journal.db | ||
testcsyncsqlite.h | ||
testfolderwatcher.h | ||
testinotifywatcher.h | ||
testowncloudpropagator.h | ||
testplan.txt | ||
testupdater.h | ||
testutility.h |