Merge branch 'develop' into adv-beta

DFHack · Aug 23, 2024 · 55b5328 · 55b5328
2 parents 7bc685c + 9e50f5f
commit 55b5328
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/docs/about/Authors.rst b/docs/about/Authors.rst
@@ -102,6 +102,7 @@ Joel Meador janxious
 John Beisley huin
 John Cosker johncosker
 John Shade gsvslto
+Johnny Fisher jfisher446 JohnnyWing
 Jonas Ask
 Jonathan Clark AridTag
 Josh Cooper cppcooper coope

diff --git a/scripts b/scripts