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

Browse Source

 Conflicts:

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

	doc/mkdocs/docs/features/binary_formats/bson.md

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

	doc/mkdocs/mkdocs.yml

	include/nlohmann/json.hpp

	single_include/nlohmann/json.hpp

...

This commit is contained in:

Niels Lohmann

2021-12-31 14:53:13 +01:00

parent 7c26010380 926df56ddb

commit 9dfe422e65

427 changed files with 6293 additions and 13280 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

6208

single_include/nlohmann/json.hpp

File diff suppressed because it is too large Load Diff