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
..
2019-11-07 09:13:25 +01:00
2019-11-07 09:13:25 +01:00
2019-11-07 12:57:27 +01:00
2019-11-07 16:55:55 +01:00