Filip Bucek ab41e47f1e Merge branch 'master' into server-sdk ...

# Conflicts:
#	src/colnod/databasemanager.h
#	src/colnod/datamanager.cpp
#	src/colnod/syncmanager.cpp

2019-11-07 17:16:24 +01:00

..

unitTests

Merge branch 'master' into server-sdk

2019-11-07 17:16:24 +01:00

test.pro

Project structure

2019-10-01 09:17:43 +02:00