Merge pull request #62 from glotzerlab/tcmoore3-docfix

A few small fixes to documentation
glotzerlab · Sep 25, 2023 · 48a1592 · 48a1592
2 parents 955b7a1 + e847901
commit 48a1592
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 1 deletion.
diff --git a/.mailmap b/.mailmap
@@ -0,0 +1,3 @@
+Tim Moore <[email protected]> Tim Moore <[email protected]>
+Tommy Waltmann <[email protected]> Tommy Waltmann <[email protected]>
+Tommy Waltmann <[email protected]> tommy-waltmann <[email protected]>
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -6,7 +6,7 @@ the project.
 
 ## Base your work off the correct branch
 
-All new work should be based on `main`.
+All new work should be based on `trunk`.
 
 ## Propose a minimal set of related changes
 

diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
@@ -0,0 +1,8 @@
+# Contributors
+
+The following people have contributed to hoomd-validation:
+
+* Joshua A. Anderson, University of Michigan
+* Tommy Waltmann, University of Michigan
+* Tim Moore, University of Michigan
+* Brandon Butler, University of Michigan