Merge remote-tracking branch 'origin/develop' into claude/fix-issue-3989-db7e45

Browse Source

Signed-off-by: Niels Lohmann <mail@nlohmann.me>

# Conflicts:
#	include/nlohmann/detail/input/binary_reader.hpp
#	include/nlohmann/detail/string_utils.hpp
#	single_include/nlohmann/json.hpp

...

This commit is contained in:

Niels Lohmann committed 2026-10-04 12:22:05 +02:00

2 parents 650886d126 73e9eae3c1

commit 7b0af0072e

82 files changed

+7749 -2474

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

include/nlohmann/json.hpp

+336 -437

File diff suppressed because it is too large. Load diff