nextcloud-desktop/csync/tests
Daniel Molkentin 3016844dd7 Merge branch 'master' into rename_client
Conflicts:
	README.md
	src/gui/folderman.cpp
	src/gui/settingsdialog.cpp
	src/libsync/accessmanager.cpp
	src/libsync/propagateupload.h
2014-12-02 13:37:22 +01:00
..
csync_tests
encoding_tests
httpbf_tests
log_tests
ownCloud
std_tests
vio_tests
CMakeLists.txt
cmdline.c
torture.c
torture.h
valgrind-csync.supp