Niels Lohmann 1816aae862 Merge branch 'develop' of https://github.com/nlohmann/json into docs

2020-07-25 21:48:51 +02:00

..

detail

Merge pull request #2308 from nlohmann/cbor_tags

2020-07-25 19:43:11 +02:00

thirdparty/hedley

…

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

📝 update output of meta function

2020-07-25 14:41:06 +02:00

ordered_map.hpp

🔀 merge develop branch and resolve conflicts

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