Niels Lohmann 9c21285133 Merge branch 'develop' of https://github.com/nlohmann/json into issue2179 ... Conflicts: single_include/nlohmann/json.hpp		2020-07-11 13:20:16 +02:00
..
detail	🚩 use JSON_ASSERT(x) instead of assert(x)	2020-07-06 12:22:31 +02:00
thirdparty/hedley	⬆️ Hedley 13	2020-04-06 11:56:33 +02:00
adl_serializer.hpp	🚨 fixed some more linter warnings	2018-10-28 09:15:41 +01:00
byte_container_with_subtype.hpp	📝 update documentation	2020-05-22 18:21:37 +02:00
json.hpp	Merge branch 'develop' of https://github.com/nlohmann/json into issue2179	2020-07-11 13:20:16 +02:00
json_fwd.hpp	Fix compilation for xcode 9.x	2020-07-03 01:44:18 +01:00
ordered_map.hpp	Remove redundant comment	2020-07-11 00:34:02 +01:00