domsoll 6d9bfe681d Merge branch 'develop' into conversion_checks ... # Conflicts: # CMakeLists.txt # include/nlohmann/detail/conversions/from_json.hpp # include/nlohmann/detail/macro_scope.hpp # single_include/nlohmann/json.hpp		2021-09-15 16:59:11 +02:00
..
detail	Merge branch 'develop' into conversion_checks	2021-09-15 16:59:11 +02:00
thirdparty/hedley	🚨 add new CI and fix warnings (#2561)	2021-03-24 07:15:18 +01:00
adl_serializer.hpp	Updated comments as requested.	2021-01-23 18:24:47 +01:00
byte_container_with_subtype.hpp	Overwork warning flags (#2936)	2021-08-17 14:43:43 +02:00
json_fwd.hpp	Fix compilation for xcode 9.x	2020-07-03 01:44:18 +01:00
json.hpp	Set parent pointers for values inserted via update() (fixes #3007). (#3008)	2021-09-12 18:51:25 +02:00
ordered_map.hpp	🚨 add new CI and fix warnings (#2561)	2021-03-24 07:15:18 +01:00