Merge branch 'develop' into claude/pr-3899-merge-requirements-e1932e

Browse Source

Conflicts:
- tests/src/unit-custom-base-class.cpp: include list; kept this PR's
  <type_traits>/<utility> and develop's <vector>

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

...

This commit is contained in:

Niels Lohmann

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

parent 4ab78e8092 6a073dbae4

commit 8c266a10a8

80 changed files with 4872 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

+1230 -296

File diff suppressed because it is too large Load Diff