Niels Lohmann 9dfe422e65 Merge branch 'develop' of https://github.com/nlohmann/json into bon8 ... 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		2021-12-31 14:53:13 +01:00
..
docs	Merge branch 'develop' of https://github.com/nlohmann/json into bon8	2021-12-31 14:53:13 +01:00
scripts	Consolidate documentation (#3071)	2021-12-29 13:41:01 +01:00
Makefile	Consolidate documentation (#3071)	2021-12-29 13:41:01 +01:00
mkdocs.yml	Merge branch 'develop' of https://github.com/nlohmann/json into bon8	2021-12-31 14:53:13 +01:00
requirements.txt	📝 add PlantUML	2020-05-24 21:05:35 +02:00