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

 Conflicts:

	doc/examples/swap__binary_t.link

2020-06-07 21:02:08 +02:00

..

css

…

examples

📝 add example link for swap function

2020-06-07 21:01:13 +02:00

images

📝 add mkdocs

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

mkdocs

📝 add page on parsing and exceptions

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

scripts

🔧 set Wandbox script to use HTTPS

2020-05-12 14:37:22 +02:00

usages

…

avatars.png

👥 update contributor list

2020-06-03 13:56:01 +02:00

Doxyfile

📝 add mkdocs

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

index.md

♻️ rename internal_binary_t with binary_t

2020-05-17 22:50:27 +02:00

json.gif

🔖 set version to 3.7.3

2019-11-17 12:09:12 +01:00

Makefile

…