Merge pull request KelvinTegelaar#1640 from KelvinTegelaar/dev

Dev to release
SynergiTech · Jul 21, 2023 · fb47935 · fb47935
2 parents 5951509 + 59cc85d
commit fb47935
Show file tree

Hide file tree

Showing 33 changed files with 1,214 additions and 760 deletions.
diff --git a/.github/pull.yml b/.github/pull.yml
@@ -0,0 +1,11 @@
+version: "1"
+rules:
+  - base: main
+    upstream: KelvinTegelaar:main
+    mergeMethod: merge
+  - base: dev
+    upstream: KelvinTegelaar:dev
+    mergeMethod: none
+  - base: website
+    upstream: KelvinTegelaar:website
+    mergeMethod: merge