Niels Lohmann 4a16e5596c Merge branch 'develop' of https://github.com/nlohmann/json into string_view ... Conflicts: include/nlohmann/detail/meta/type_traits.hpp single_include/nlohmann/json.hpp		2021-05-03 20:12:53 +02:00
..
ci.cmake	Merge branch 'develop' of https://github.com/nlohmann/json into string_view	2021-05-03 20:12:53 +02:00
config.cmake.in	cmake: fix package config to deal with versioning and namespaces	2018-09-30 09:56:33 -04:00
download_test_data.cmake	fix cmake script overwriting compiler path	2020-08-07 16:08:02 +08:00
nlohmann_jsonConfigVersion.cmake.in	add comments	2020-04-17 15:44:12 -04:00
pkg-config.pc.in	pkg-config.pc.in: Don't concatenate paths	2021-03-29 21:43:49 +00:00