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

2026-05-04 13:25:23 +00:00 · 2021-10-17 15:27:48 +02:00
parent cec6b21695 67c8ead923
commit d997d1b275
85 changed files with 698 additions and 346 deletions
@@ -1 +1 @@
-<a target="_blank" href="https://wandbox.org/permlink/7p8sQckddTc0Y81T"><b>online</b></a>
+<a target="_blank" href="https://wandbox.org/permlink/1mp10JbaANo6FUc7"><b>online</b></a>
@@ -2,7 +2,7 @@
    "compiler": {
        "c++": "201103",
        "family": "clang",
-        "version": "12.0.5 (clang-1205.0.22.11)"
+        "version": "13.0.0 (clang-1300.0.29.3)"
    },
    "copyright": "(C) 2013-2021 Niels Lohmann",
    "name": "JSON for Modern C++",
@@ -11,7 +11,7 @@
    "version": {
        "major": 3,
        "minor": 10,
-        "patch": 2,
-        "string": "3.10.2"
+        "patch": 4,
+        "string": "3.10.4"
    }
 }