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
..
nlohmann	Merge branch 'develop' into derived_macros	2023-09-16 08:40:06 +02:00