Merge remote-tracking branch 'origin/develop' into custom-number-type-fixes

Browse Source

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

# Conflicts:
#	include/nlohmann/detail/output/binary_writer.hpp
#	single_include/nlohmann/json.hpp

...

This commit is contained in:

Niels Lohmann committed 2026-10-11 11:10:34 +02:00

2 parents fcb5198a2c c59ad95252

commit 969f17fae1

110 files changed

+3572 -2047

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

Generated

+745 -450

File diff suppressed because it is too large. Load diff