Niels Lohmann 371a8a3d9f Merge branch 'json-view/08-view-builder' into json-view/10-view-document ...

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

# Conflicts:
#	Makefile
#	cmake/ci.cmake

2026-10-01 10:19:49 +02:00

..

json_fwd.hpp

Fix CI jobs that check less than they claim; move arm64 to GitHub (#5733)

2026-09-30 22:49:24 +02:00

json_literals.hpp

Move the user-defined string literals to <nlohmann/json_literals.hpp> and add JSON_NO_AUTOMATIC_UDLS (#5610)

2026-09-30 20:08:17 +02:00

json_view.hpp

Address the cpplint findings of json_view's materialize()

2026-09-30 20:58:48 +02:00

json.hpp

Merge branch 'json-view/04-unicode-escapes' into json-view/08-view-builder

2026-10-01 10:18:33 +02:00