mirror/json
1
0
Fork 0
mirror of https://github.com/nlohmann/json.git synced 2025-01-23 02:23:41 +08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity
996ac1c017
json/include/nlohmann
History
Niels Lohmann 996ac1c017
Merge branch 'develop' of https://github.com/nlohmann/json into issue2572 
 Conflicts:
	include/nlohmann/detail/output/serializer.hpp
	single_include/nlohmann/json.hpp
2021-07-15 21:57:52 +02:00
..
detail Merge branch 'develop' of https://github.com/nlohmann/json into issue2572 2021-07-15 21:57:52 +02:00
thirdparty/hedley 🚨 add new CI and fix warnings (#2561) 2021-03-24 07:15:18 +01:00
adl_serializer.hpp Updated comments as requested. 2021-01-23 18:24:47 +01:00
byte_container_with_subtype.hpp 🚨 add new CI and fix warnings (#2561) 2021-03-24 07:15:18 +01:00
json_fwd.hpp Fix compilation for xcode 9.x 2020-07-03 01:44:18 +01:00
json.hpp 🚨 fix warnings 2021-07-13 15:37:57 +02:00
ordered_map.hpp 🚨 add new CI and fix warnings (#2561) 2021-03-24 07:15:18 +01:00