Merge branch 'develop' of https://github.com/nlohmann/json into bon8

Browse Source

 Conflicts:

	docs/mkdocs/docs/api/basic_json/index.md

	docs/mkdocs/docs/features/binary_formats/index.md

	docs/mkdocs/mkdocs.yml

	tests/src/unit-binary_formats.cpp

...

This commit is contained in:

Niels Lohmann

2022-06-18 21:19:48 +02:00

parent ad662d15bc 87cda1d664

commit dfdbbc71bb

146 changed files with 5201 additions and 1259 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

1067

single_include/nlohmann/json.hpp

File diff suppressed because it is too large Load Diff