Niels Lohmann 5e55158d60 Merge branch 'develop' of https://github.com/nlohmann/json into feature/optional ... Conflicts: test/src/unit-conversions.cpp		2020-12-21 20:59:41 +01:00
..
conversions	Merge branch 'develop' of https://github.com/nlohmann/json into feature/optional	2020-08-07 09:37:56 +02:00
input	🚨 remove -Wimplicit-fallthrough warning #2348	2020-08-10 20:48:39 +02:00
iterators	♻️ remove "#define private public"	2020-08-12 13:30:06 +02:00
meta	Merge pull request #2533 from nlohmann/c++_future	2020-12-16 20:54:09 +01:00
output	Apply suggestions from code review	2020-11-24 11:02:58 -08:00
exceptions.hpp	🚧 support for UBJSON high-precision numbers #2286	2020-07-20 13:57:19 +02:00
hash.hpp	🚨 remove -Wimplicit-fallthrough warning #2348	2020-08-10 20:48:39 +02:00
json_pointer.hpp	♻️ remove "#define private public"	2020-08-12 13:30:06 +02:00
json_ref.hpp	🎨 amalgamate code	2020-12-14 10:38:49 +01:00
macro_scope.hpp	Merge branch 'develop' of https://github.com/nlohmann/json into feature/optional	2020-12-21 20:59:41 +01:00
macro_unscope.hpp	♻️ remove "#define private public"	2020-08-12 13:30:06 +02:00
value_t.hpp	🔥 remove unused boolean_operators.hpp header	2020-07-11 19:20:44 +02:00