Merge branch 'master' into test-lineending

Browse Source

# 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

...

This commit is contained in:

Filip Bucek 2019-11-08 11:29:40 +01:00

parent 8bb1bbd125 c9a311d4aa

commit 2d03f742bb

5 changed files with 57 additions and 57 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files