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

 Conflicts:

	single_include/nlohmann/json.hpp

2020-07-25 21:44:58 +02:00

..

binary_formats

📝 update documentation

2020-07-20 14:11:43 +02:00

parsing

📝 add page on parsing and exceptions

2020-06-04 14:01:57 +02:00

arbitrary_types.md

📝 update documentation

2020-07-23 14:15:20 +02:00

binary_values.md

📝 make examples collapsible

2020-05-24 22:45:38 +02:00

enum_conversion.md

📝 add mkdocs

2020-05-24 13:03:04 +02:00

iterators.md

📝 add more content to iterator page

2020-05-25 14:03:11 +02:00

json_patch.md

📝 make examples collapsible

2020-05-24 22:45:38 +02:00

json_pointer.md

📝 add mkdocs

2020-05-24 13:03:04 +02:00

macros.md

📝 update documentation

2020-07-23 14:15:20 +02:00

merge_patch.md

📝 make examples collapsible

2020-05-24 22:45:38 +02:00

types.md

📝 add more content to iterator page

2020-05-25 14:03:11 +02:00