Jonathan G Rennison
cf4cf5c08f
Codechange: vendor the nlohmann-json library (#11290)
(cherry picked from commit ba67f39db6)
# Conflicts:
# .github/workflows/ci-build.yml
# CMakeLists.txt
# COMPILING.md
# src/os/macosx/survey_osx.cpp
# src/os/windows/survey_win.cpp
# src/script/api/script_admin.cpp
# src/script/api/script_event_types.cpp
# src/tests/test_script_admin.cpp
2023-11-17 19:20:35 +00:00
..
2023-05-14 23:22:02 +02:00
2020-12-15 15:46:39 +01:00
2020-12-15 15:46:39 +01:00
2020-12-15 15:46:39 +01:00