Merge branch 'master' into dav - get cmocka tests and database move.
Conflicts: CMakeLists.txt cmake/Modules/FindCMocka.cmake src/csync.c src/csync_exclude.c src/csync_reconcile.c src/csync_statedb.c src/csync_update.c src/csync_util.c src/vio/csync_vio.c tests/CMakeLists.txt tests/csync_tests/check_csync_exclude.c tests/csync_tests/check_csync_statedb_load.c tests/csync_tests/check_csync_statedb_query.c tests/csync_tests/check_csync_update.c tests/std_tests/check_std_c_path.c
Please register or sign in to comment