Merge in upstream changes and resolve conflicts

Nick-Eagles · Aug 7, 2023 · 0b27ced · 0b27ced
2 parents f912265 + d193454
commit 0b27ced
Show file tree

Hide file tree

Showing 20 changed files with 502 additions and 176 deletions.
diff --git a/.github/.gitignore b/.github/.gitignore
@@ -0,0 +1 @@
+*.html
diff --git a/.github/workflows/R-cmd-check.yaml b/.github/workflows/R-cmd-check.yaml