Niels Lohmann 5e9bf559b1 # Conflicts: ...

#	.github/workflows/macos.yml
#	include/nlohmann/detail/input/parser.hpp
#	include/nlohmann/detail/meta/std_fs.hpp
#	include/nlohmann/json.hpp
#	single_include/nlohmann/json.hpp

2024-11-16 23:23:05 +01:00

..

conversions

# Conflicts:

2024-11-16 23:23:05 +01:00

input

# Conflicts:

2024-11-16 23:23:05 +01:00

iterators

# Conflicts:

2024-11-16 23:23:05 +01:00

meta

🚨 fix warning

2024-11-08 23:19:04 +01:00

output

# Conflicts:

2024-11-16 23:23:05 +01:00

abi_macros.hpp

JSON for Modern C++ 3.11.3 (#4222)

2023-11-28 22:36:31 +01:00

exceptions.hpp

JSON for Modern C++ 3.11.3 (#4222)

2023-11-28 22:36:31 +01:00

hash.hpp

JSON for Modern C++ 3.11.3 (#4222)

2023-11-28 22:36:31 +01:00

json_custom_base_class.hpp

JSON for Modern C++ 3.11.3 (#4222)

2023-11-28 22:36:31 +01:00

json_pointer.hpp

JSON for Modern C++ 3.11.3 (#4222)

2023-11-28 22:36:31 +01:00

json_ref.hpp

JSON for Modern C++ 3.11.3 (#4222)

2023-11-28 22:36:31 +01:00

macro_scope.hpp

🔀 merge develop

2024-11-08 22:40:55 +01:00

macro_unscope.hpp

JSON for Modern C++ 3.11.3 (#4222)

2023-11-28 22:36:31 +01:00

string_concat.hpp

JSON for Modern C++ 3.11.3 (#4222)

2023-11-28 22:36:31 +01:00

string_escape.hpp

JSON for Modern C++ 3.11.3 (#4222)

2023-11-28 22:36:31 +01:00

value_t.hpp

JSON for Modern C++ 3.11.3 (#4222)

2023-11-28 22:36:31 +01:00