Niccolò Iardella 358ba8b62d Merge branch 'develop' into derived_macros ... # Conflicts: # include/nlohmann/detail/macro_scope.hpp # single_include/nlohmann/json.hpp		2023-09-16 08:40:06 +02:00
..
detail	Merge branch 'develop' into derived_macros	2023-09-16 08:40:06 +02:00
thirdparty/hedley	🔖 set version to 3.11.2	2022-08-12 15:04:06 +02:00
adl_serializer.hpp	🔖 set version to 3.11.2	2022-08-12 15:04:06 +02:00
byte_container_with_subtype.hpp	🔖 set version to 3.11.2	2022-08-12 15:04:06 +02:00
json_fwd.hpp	Allow custom base class as node customization point (#3110)	2022-08-28 13:59:07 +02:00
json.hpp	Fix CI, again (#4083)	2023-09-07 20:41:12 +02:00
ordered_map.hpp	Fix Clang-Tidy warnings (#4047)	2023-06-08 18:46:48 +02:00