Merge pull request #27 from maxiim3/dev

Merge Beta Dev > Main
maxiim3 · Sep 27, 2023 · 9c96490 · 9c96490
2 parents b790dd1 + 9ce320e
commit 9c96490
Show file tree

Hide file tree

Showing 113 changed files with 14,561 additions and 11,172 deletions.
diff --git a/.gitignore b/.gitignore
@@ -34,3 +34,6 @@ yarn-error.log*
 # typescript
 *.tsbuildinfo
 next-env.d.ts
+
+# bun lock
+/bun.lockb
diff --git a/app/(pages)/about/page.tsx b/app/(pages)/about/page.tsx
diff --git a/app/(pages)/contact/ContactFormComponent.tsx b/app/(pages)/contact/ContactFormComponent.tsx
diff --git a/app/(pages)/contact/page.tsx b/app/(pages)/contact/page.tsx
diff --git a/app/(pages)/eng/page.tsx b/app/(pages)/eng/page.tsx