Files
json/docs/mkdocs
Niels Lohmann 289d61ef4f Merge branch 'develop' into docs/review-fixes
Conflicts:
- include/nlohmann/json.hpp: took develop's removal of the UDLs (moved to json_literals.hpp, which already has the corrected @sa links)
- single_include/nlohmann/json.hpp: regenerated with make amalgamate
- docs/mkdocs/docs/api/operator_literal_json.md, operator_literal_json_pointer.md: kept the PR's migration guide link and develop's json_literals.hpp/JSON_NO_AUTOMATIC_UDLS note
- docs/mkdocs/docs/api/basic_json/to_bson.md: both sides added out_of_range.415; kept develop's example message and both version history lines
- docs/docset/docSet.sql: added JSON_NO_AUTOMATIC_UDLS (new on develop), which the PR's check_structure.py requires

Signed-off-by: Niels Lohmann <mail@nlohmann.me>
2026-09-30 20:39:42 +02:00
..
2026-09-27 16:56:21 +02:00