Merge remote-tracking branch 'origin/develop' into claude/fix-issue-3989-db7e45

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

docs/mkdocs/mkdocs.yml

@@ -183,6 +183,7 @@ nav:
           - 'json_serializer': api/basic_json/json_serializer.md
           - 'max_size': api/basic_json/max_size.md
           - 'meta': api/basic_json/meta.md
+          - 'merge_diff': api/basic_json/merge_diff.md
           - 'merge_patch': api/basic_json/merge_patch.md
           - 'number_float_t': api/basic_json/number_float_t.md
           - 'number_integer_t': api/basic_json/number_integer_t.md
@@ -453,8 +454,12 @@ plugins:
       # package badges (the fetch fails, then reading the missing cache entry
       # raises FileNotFoundError). Readers' browsers are served normally, so
       # leave these badges as external references instead of self-hosting them.
+      # The same goes for img.shields.io, whose version badges time out from
+      # time to time (strict mode turns the failed download into an error) and
+      # would go stale between builds if they were self-hosted anyway.
       assets_exclude:
         - repology.org/*
+        - img.shields.io/*
   - llmstxt:
       markdown_description: >
         JSON for Modern C++ is a C++11 header-only library implementing a JSON