Merge branches 'develop' and 'mkdocs' of https://github.com/nlohmann/json into mkdocs

This commit is contained in:
Niels Lohmann 2020-06-04 13:07:20 +02:00
commit 32bda1a7af
No known key found for this signature in database
GPG key ID: 7F3CEA63AE251B69
19 changed files with 409 additions and 276 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1 MiB

After

Width:  |  Height:  |  Size: 1.1 MiB

Before After
Before After