Niels Lohmann
|
88fbbd3aa8
|
Merge branch 'develop' of https://github.com/nlohmann/json into bon8
Conflicts:
docs/examples/to_bon8.cpp
docs/examples/to_bon8.output
docs/mkdocs/docs/api/basic_json/to_bon8.md
include/nlohmann/detail/input/binary_reader.hpp
include/nlohmann/detail/input/input_adapters.hpp
include/nlohmann/detail/output/binary_writer.hpp
single_include/nlohmann/json.hpp
test/CMakeLists.txt
tests/src/unit-binary_formats.cpp
tests/src/unit-bon8.cpp
|
2022-05-01 18:46:44 +02:00 |
|