Niels Lohmann d1f84e81e9 Merge branch 'develop' of https://github.com/nlohmann/json into clean_doxygen ... Conflicts: include/nlohmann/detail/input/input_adapters.hpp include/nlohmann/json.hpp single_include/nlohmann/json.hpp		2021-11-13 14:31:42 +01:00
..
conversions	🔥 consolidate documentation	2021-11-04 22:02:48 +01:00
input	Merge branch 'develop' of https://github.com/nlohmann/json into clean_doxygen	2021-11-13 14:31:42 +01:00
iterators	Update CI (#3088)	2021-10-29 21:27:34 +02:00
meta	fix std::filesystem::path regression (#3073)	2021-10-14 19:19:46 +02:00
output	Merge branch 'develop' of https://github.com/nlohmann/json into clean_doxygen	2021-11-13 14:31:42 +01:00
exceptions.hpp	🔥 consolidate documentation	2021-11-05 22:10:17 +01:00
hash.hpp	🐛 adding missing header	2021-08-18 13:33:35 +02:00
json_pointer.hpp	♻️ fix URLs	2021-11-05 21:46:15 +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	2021-11-04 22:02:48 +01:00
macro_unscope.hpp	meta: fix is_compatible/constructible traits (#3020)	2021-10-07 12:32:25 +02: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