Niels Lohmann 9c21285133 Merge branch 'develop' of https://github.com/nlohmann/json into issue2179 ...

 Conflicts:

	single_include/nlohmann/json.hpp

2020-07-11 13:20:16 +02:00

..

cmake_add_subdirectory

Update tests that generate CMake projects to use the CMAKE_CXX_COMPILER the main project was CMake'd with. Fixes #1747.

2019-11-18 21:46:34 -06:00

cmake_fetch_content

🔧 add label to tests that require a git checkout

2020-06-17 12:35:59 +02:00

cmake_import

Update tests that generate CMake projects to use the CMAKE_CXX_COMPILER the main project was CMake'd with. Fixes #1747.

2019-11-18 21:46:34 -06:00

cmake_import_minver

Update tests that generate CMake projects to use the CMAKE_CXX_COMPILER the main project was CMake'd with. Fixes #1747.

2019-11-18 21:46:34 -06:00

reports

added fuzzing results

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

src

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

2020-07-11 13:20:16 +02:00

thirdparty

🚨 fix warnings #2113

2020-05-16 14:26:17 +02:00

CMakeLists.txt

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

2020-07-11 13:20:16 +02:00

Makefile

unified input API

2020-05-27 12:40:04 -04:00