mirror of
https://gitlab.com/spaceti-app/integrations/acs/colnod-connector.git
synced 2026-07-12 14:10:40 +02:00
# Conflicts: # src/colnod/databaseapi.cpp # src/colnod/databaseapi.h # src/colnod/syncmanager.cpp # src/colnod/syncmanager.h # test/auto/colnod/tst_colnodapi.cpp # test/auto/syncmanager/tst_syncmanager.cpp