Merge branch 'KelvinTegelaar:main' into main

SynergiTech · Jul 25, 2023 · ac87cdb · ac87cdb
2 parents c03cb18 + fb47935
commit ac87cdb
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