amorfo77/json
1
0
Fork 0
mirror of https://github.com/nlohmann/json.git synced 2026-02-24 12:26:25 +00:00
Code Issues Packages Projects Releases Wiki Activity
4,386 Commits 24 Branches 57 Tags
ad662d15bcd98a1c7eed71ca0b590aba75e56c18
Commit Graph

2 Commits

Author SHA1 Message Date
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
Niels Lohmann
b21c345179 Reorganize directories (#3462) 
* 🚚 move files
* 🚚 rename doc folder to docs
* 🚚 rename test folder to tests
 2022-05-01 09:41:50 +02:00