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

Browse Source

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

# Conflicts:
#	tests/src/unit-alt-string.cpp

...

This commit is contained in:

Niels Lohmann committed 2026-09-30 20:11:28 +02:00

2 parents c16dd7e4f5 6fc0d501f3

commit 5f1727cef2

79 files changed

+4797 -633

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

+1221 -292

File diff suppressed because it is too large. Load diff