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
..
detail	Merge branch 'develop' of https://github.com/nlohmann/json into bon8	2021-12-31 14:53:13 +01:00
thirdparty/hedley	🚨 add new CI and fix warnings (#2561)	2021-03-24 07:15:18 +01:00
adl_serializer.hpp	Consolidate documentation (#3071)	2021-12-29 13:41:01 +01:00
byte_container_with_subtype.hpp	Consolidate documentation (#3071)	2021-12-29 13:41:01 +01:00
json_fwd.hpp	Consolidate documentation (#3071)	2021-12-29 13:41:01 +01:00
json.hpp	Merge branch 'develop' of https://github.com/nlohmann/json into bon8	2021-12-31 14:53:13 +01:00
ordered_map.hpp	Add missing erase(first, last) function to ordered_map (#3109)	2021-11-09 22:24:58 +01:00