json/include/nlohmann/detail
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
..
conversions Consolidate documentation (#3071) 2021-12-29 13:41:01 +01:00
input Merge branch 'develop' of https://github.com/nlohmann/json into bon8 2021-12-31 14:53:13 +01:00
iterators Update CI (#3088) 2021-10-29 21:27:34 +02:00
meta Add C++17 copies of the test binaries (#3101) 2021-12-29 09:47:05 +01:00
output Merge branch 'develop' of https://github.com/nlohmann/json into bon8 2021-12-31 14:53:13 +01:00
exceptions.hpp Consolidate documentation (#3071) 2021-12-29 13:41:01 +01:00
hash.hpp 🐛 adding missing header 2021-08-18 13:33:35 +02:00
json_pointer.hpp Consolidate documentation (#3071) 2021-12-29 13:41:01 +01:00
json_ref.hpp 🚨 add new CI and fix warnings (#2561) 2021-03-24 07:15:18 +01:00
macro_scope.hpp Consolidate documentation (#3071) 2021-12-29 13:41:01 +01:00
macro_unscope.hpp Add C++17 copies of the test binaries (#3101) 2021-12-29 09:47:05 +01:00
string_escape.hpp 🐛 proper JSON Pointer escape in diagnostic messages 2021-01-16 15:33:05 +01:00
value_t.hpp 🚨 fix warnings 2021-01-10 13:39:36 +01:00