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

..

colnod.pri

fix endlines

2019-11-20 16:06:43 +01:00

colnodapi.cpp

download data from colnod test

2019-11-28 11:29:51 +01:00

colnodapi.h

download data from colnod test

2019-11-28 11:29:51 +01:00

data.cpp

Clanz and clanzy

2019-11-21 11:50:12 +01:00

data.h

WIP: different approach

2019-11-26 17:58:13 +01:00

databaseapi.cpp

Implement basic unit tests for download data and open database

2019-11-27 16:38:12 +01:00

databaseapi.h

Implement basic unit tests for download data and open database

2019-11-27 16:38:12 +01:00

subject.cpp

bugs fix

2019-11-21 15:33:22 +01:00

subject.h

Finished Info output

2019-11-21 10:39:55 +01:00

syncmanager.cpp

Merge branch 'refs/heads/master' into feat/unittest-colnod

2019-11-28 11:34:47 +01:00

syncmanager.h

Merge branch 'transform-app-using-serversdk' into 'suggest/different-approach'

2019-11-27 11:34:48 +00:00

token.cpp

Clanz and clanzy

2019-11-21 11:50:12 +01:00

token.h

bugs fix

2019-11-21 15:33:22 +01:00

tokens.json

Change all files to LF

2019-11-08 10:51:31 +01:00