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/json.hpp
#	single_include/nlohmann/json.hpp

...

This commit is contained in:

Niels Lohmann committed 2026-09-30 22:53:03 +02:00

2 parents 5f1727cef2 c261578431

commit 7e8e8e219b

55 files changed

+3174 -2080

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

single_include/nlohmann/json.hpp

+962 -951

File diff suppressed because it is too large. Load diff