Niels Lohmann 3249a4d821 Merge branch 'develop' of https://github.com/nlohmann/json into issue2286 ...

 Conflicts:

	single_include/nlohmann/json.hpp

2020-07-21 22:01:32 +02:00

..

detail

Merge branch 'develop' of https://github.com/nlohmann/json into issue2286

2020-07-21 22:01:32 +02:00

thirdparty/hedley

⬆️ Hedley 13

2020-04-06 11:56:33 +02:00

adl_serializer.hpp

🎨 replace alternative operators (and, not, or)

2020-06-03 14:20:36 +02:00

byte_container_with_subtype.hpp

📝 update documentation

2020-05-22 18:21:37 +02:00

json_fwd.hpp

Fix compilation for xcode 9.x

2020-07-03 01:44:18 +01:00

json.hpp

🚨 fix warnings

2020-07-20 22:38:00 +02:00

ordered_map.hpp

🔀 merge develop branch and resolve conflicts

2020-07-11 13:21:13 +02:00