Merge branch 'develop' into claude/fix-issue-2649-738aba

Browse Source

Conflicts:
- tests/src/unit-alt-string.cpp: kept both new sections (this PR's
  "conversion between basic_json specializations (#2649)" and develop's
  "strict enum" regression test for #5667)

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

...

This commit is contained in:

Niels Lohmann

2026-09-30 20:28:53 +02:00

parent 2dc43e8bf8 6a073dbae4

commit 954bdad63b

89 changed files with 5613 additions and 641 deletions

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

single_include/nlohmann/json.hpp

+1421 -289

File diff suppressed because it is too large Load Diff