amorfo77/json
1
0
Fork 0
mirror of https://github.com/nlohmann/json.git synced 2026-09-21 15:38:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into HEAD

Browse Source 
Resolves a conflict in tests/src/unit-diagnostics.cpp: develop's
swap(array_t&)/swap(object_t&) parent-pointer regression test and this
branch's copy-descent regression test both added a new SECTION at the
same place; kept both as siblings.

Signed-off-by: Niels Lohmann <mail@nlohmann.me>
This commit is contained in:
Niels Lohmann
2026-09-15 21:16:52 +02:00
parent cf5db2ea98 c72f37a40d
commit 1881df5e50
47 changed files with 2817 additions and 331 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/mkdocs/mkdocs.yml
+1
View File
@@ -98,6 +98,7 @@ nav:
- Types:
- features/types/index.md
- features/types/number_handling.md
- features/types/template_parameters.md
- Integration:
- integration/index.md
- integration/migration_guide.md