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 committed 2022-06-18 21:19:48 +02:00

2 parents ad662d15bc 87cda1d664

commit dfdbbc71bb

146 files changed

+5201 -1259

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

+738 -329

File diff suppressed because it is too large. Load diff