Niels Lohmann 1cafc6bfbb Merge origin/develop into docs/cross-reference-json-view-3-13-0 ...

Resolve the See also conflicts in basic_json_document and basic_json_view
in favour of develop (#5906).

Signed-off-by: Niels Lohmann <mail@nlohmann.me>

2026-10-24 18:50:36 +02:00

..

docs

Merge origin/develop into docs/cross-reference-json-view-3-13-0

2026-10-24 18:50:36 +02:00

hooks

Improve documentation: byte layouts, release pages, See also, dark-mode images (#5906)

2026-10-24 17:57:44 +02:00

includes

Clean up non-code files (#5801)

2026-10-11 08:21:51 +02:00

scripts

Bump dompurify from 3.4.16 to 3.4.17 in /docs/mkdocs/scripts/mermaid (#5904)

2026-10-24 07:37:42 +02:00

Makefile

Generate the docset index and pages with Python (#5799)

2026-10-10 12:10:11 +02:00

mkdocs.yml

Improve documentation: byte layouts, release pages, See also, dark-mode images (#5906)

2026-10-24 17:57:44 +02:00

requirements.txt

Bump mkdocs-llmstxt from 0.5.0 to 0.5.1 in /docs/mkdocs (#5817)

2026-10-14 17:40:07 +02:00