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

..

docs

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

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

Makefile

📝 make examples collapsible

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

mkdocs.yml

📝 add documentation for macros

2020-07-09 13:23:33 +02:00

requirements.txt

📝 add PlantUML

2020-05-24 21:05:35 +02:00