Niels Lohmann 0a0eb7a850 Merge branch 'develop' of https://github.com/nlohmann/json into issue2863 ...

 Conflicts:

	.github/workflows/windows.yml

2021-08-14 11:19:48 +02:00

..

cmake_add_subdirectory

✅ annotate non-reproducible tests #2324

2020-08-30 13:23:34 +02:00

cmake_fetch_content

🐛 properly assign two labels to one test case #2596

2021-01-27 14:22:58 +01:00

cmake_import

✅ annotate non-reproducible tests #2324

2020-08-30 13:23:34 +02:00

cmake_import_minver

✅ annotate non-reproducible tests #2324

2020-08-30 13:23:34 +02:00

cmake_target_include_directories

✅ annotate non-reproducible tests #2324

2020-08-30 13:23:34 +02:00

reports

added fuzzing results

2016-10-02 11:23:47 +02:00

src

Merge branch 'develop' of https://github.com/nlohmann/json into issue2863

2021-08-14 11:19:48 +02:00

thirdparty

Update doctest from 2.4.4 to 2.4.6 (fixes #2686)

2021-03-25 13:16:04 -04:00

CMakeLists.txt

📝 update documentation

2021-08-11 08:06:25 +02:00

Makefile

🔥 remove test Makefile targets (all handled by CMake)

2020-07-16 13:38:25 +02:00