Niels Lohmann 4917e7c259 Merge branch 'develop' of https://github.com/nlohmann/json into diagnostics ...

 Conflicts:

	include/nlohmann/detail/input/parser.hpp

	single_include/nlohmann/json.hpp

2021-02-07 17:45:09 +01:00

..

from_json.hpp

♻️ remove diagnostics_t class

2021-01-25 13:47:50 +01:00

to_chars.hpp

🚨 fix warnings #2615

2021-01-27 12:54:46 +01:00

to_json.hpp

👌 address comment

2021-01-14 22:05:08 +01:00