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
..
emscripten	Codechange: vendor the nlohmann-json library (#11290)	2023-11-17 19:20:35 +00:00
macosx	Merge branch 'master' into jgrpp	2023-09-12 20:06:47 +01:00
steam	Add: [Actions] Automatically upload releases to Steam (#8644)	2021-02-05 20:58:15 +01:00
windows	Fix: Ensure logo for Windows Store common assets package is named correctly	2023-02-07 09:23:44 +00:00