🔀 merge develop branch

7254b1f6 · Niels Lohmann · 4703dd57 · 7254b1f6 · 7254b1f6
Unverified Commit 7254b1f6 authored Jan 02, 2022 by Niels Lohmann
Expand all Show whitespace changes
Inline Side-by-side

Showing with 140 additions and 69 deletions

include/nlohmann/json.hpp include/nlohmann/json.hpp +9 -9

single_include/nlohmann/json.hpp single_include/nlohmann/json.hpp +131 -60

No files found.
--- a/include/nlohmann/json.hpp
+++ b/include/nlohmann/json.hpp
--- a/single_include/nlohmann/json.hpp
+++ b/single_include/nlohmann/json.hpp