Ondřej Fischer 3bb6f24ae1 Merge branch 'refs/heads/master' into feat/unittest-colnod
# Conflicts:
#	server-sdk
#	src/colnod/syncmanager.cpp
#	test/auto/auto.pro
2019-11-28 11:34:47 +01:00
..
2019-11-26 11:13:19 +01:00