domsoll 6d9bfe681d Merge branch 'develop' into conversion_checks ... # Conflicts: # CMakeLists.txt # include/nlohmann/detail/conversions/from_json.hpp # include/nlohmann/detail/macro_scope.hpp # single_include/nlohmann/json.hpp		2021-09-15 16:59:11 +02:00
..
conversions	Merge branch 'develop' into conversion_checks	2021-09-15 16:59:11 +02:00
input	Merge branch 'develop' of https://github.com/nlohmann/json into issue2863	2021-08-14 11:19:48 +02:00
iterators	Adjust more files after actually building like the CI	2021-08-13 14:00:00 +02:00
meta	Fix parent update for diagnostics with ordered_json (#2963)	2021-08-22 20:30:20 +02:00
output	Allow allocators for output_vector_adapter (#2989)	2021-09-12 18:55:47 +02:00
exceptions.hpp	Add coverage exclusion comments, as requested	2021-08-13 15:30:55 +02:00
hash.hpp	🐛 adding missing header	2021-08-18 13:33:35 +02:00
json_pointer.hpp	Adjust more files after actually building like the CI	2021-08-13 14:00:00 +02:00
json_ref.hpp	🚨 add new CI and fix warnings (#2561)	2021-03-24 07:15:18 +01:00
macro_scope.hpp	Merge branch 'develop' into conversion_checks	2021-09-15 16:59:11 +02:00
macro_unscope.hpp	Overwork warning flags (#2936)	2021-08-17 14:43:43 +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