Niels Lohmann 5e55158d60 Merge branch 'develop' of https://github.com/nlohmann/json into feature/optional ...

 Conflicts:

	test/src/unit-conversions.cpp

2020-12-21 20:59:41 +01:00

..

detail

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

2020-12-21 20:59:41 +01:00

thirdparty/hedley

⬆️ Hedley 14 (dev branch)

2020-08-12 13:00:57 +02:00

adl_serializer.hpp

🎨 replace alternative operators (and, not, or)

2020-06-03 14:20:36 +02:00

byte_container_with_subtype.hpp

Change underscore placement

2020-12-11 13:43:17 +01:00

json_fwd.hpp

Fix compilation for xcode 9.x

2020-07-03 01:44:18 +01:00

json.hpp

Include <string_view> in "nlohmann/json.hpp" when C++17 is used

2020-12-20 19:40:36 +05:00

ordered_map.hpp

ordered_map::insert(InputIt first, InputIt last) is added

2020-12-07 20:15:41 +03:00