general/json
2
0
Fork 0
mirror of https://github.com/nlohmann/json.git synced 2026-01-26 19:22:20 +00:00
Code Issues Projects Releases Wiki Activity
4,523 Commits 24 Branches 57 Tags
bon8
Commit Graph

2 Commits

Author SHA1 Message Date
Niels Lohmann
107e99ef1e 📝 fix example 2022-08-13 13:02:28 +02:00
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