Filip Bucek 2d03f742bb Merge branch 'master' into test-lineending
# 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
2019-11-08 11:29:40 +01:00
..
2019-11-08 11:26:34 +01:00
2019-11-08 11:26:34 +01:00
2019-11-08 10:51:31 +01:00
2019-11-08 11:26:34 +01:00
2019-11-08 11:26:34 +01:00
2019-11-08 11:26:34 +01:00