Filip Bucek 7e4a7bf074 Merge branch 'suggest/process-data' into suggest/preapre-data-use-old
# 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
2019-12-02 15:44:14 +01:00
..
2019-11-26 11:13:19 +01:00
2019-11-28 11:46:37 +01:00