mirror of
https://gitlab.com/spaceti-app/integrations/acs/colnod-connector.git
synced 2026-07-12 21:10:38 +02:00
# Conflicts: # src/app/app.pro # src/colnod/colnod.pri # src/colnod/databasemanager.cpp # src/colnod/databasemanager.h # src/colnod/datamanager.cpp # src/colnod/datamanager.h # src/colnod/entity.h # src/colnod/requestmanager.cpp # src/colnod/subject.h # src/colnod/syncmanager.h # src/colnod/token.h # test/unitTests/unitTests.pro