Merge branch 'master' into develop

Hopefully this fixes needing merge commits on master
jdholtz · Mar 25, 2023 · 6f874ae · 6f874ae
2 parents bae175a + 291484b
commit 6f874ae
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
@@ -0,0 +1,2 @@
+github: jdholtz
+custom: https://www.paypal.com/donate/?business=RBRBNVBNR69QW