Merge branch 'main' into 31

defenseunicorns · Oct 26, 2023 · 38f1569 · 38f1569
2 parents fb6ae87 + bae8c20
commit 38f1569
Show file tree

Hide file tree

Showing 16 changed files with 4 additions and 2 deletions.
diff --git a/netlify.toml b/netlify.toml
@@ -2,8 +2,10 @@
 # (https://gohugo.io/hosting-and-deployment/hosting-on-netlify/#configure-hugo-version-in-netlify)
 
 [build]
-  command = "cd website && npm ci && hugo --gc --minify"
-  publish = "website/public"
+
+  base    = "website"
+  command = "npm ci && hugo --gc --minify"
+  publish = "public"
 
   [build.environment]
     HUGO_VERSION = "0.119.0"

diff --git a/website/static/favicons/android-144x144.png b/website/static/favicons/android-144x144.png
diff --git a/website/static/favicons/android-192x192.png b/website/static/favicons/android-192x192.png
diff --git a/website/static/favicons/android-36x36.png b/website/static/favicons/android-36x36.png
diff --git a/website/static/favicons/android-48x48.png b/website/static/favicons/android-48x48.png
diff --git a/website/static/favicons/android-72x72.png b/website/static/favicons/android-72x72.png
diff --git a/website/static/favicons/android-96x96.png b/website/static/favicons/android-96x96.png
diff --git a/website/static/favicons/android-chrome-192x192.png b/website/static/favicons/android-chrome-192x192.png
diff --git a/website/static/favicons/android-chrome-512x512.png b/website/static/favicons/android-chrome-512x512.png
diff --git a/website/static/favicons/android-chrome-maskable-192x192.png b/website/static/favicons/android-chrome-maskable-192x192.png
diff --git a/website/static/favicons/android-chrome-maskable-512x512.png b/website/static/favicons/android-chrome-maskable-512x512.png
diff --git a/website/static/favicons/apple-touch-icon-180x180.png b/website/static/favicons/apple-touch-icon-180x180.png
diff --git a/website/static/favicons/apple-touch-icon.png b/website/static/favicons/apple-touch-icon.png
diff --git a/website/static/favicons/favicon-16x16.png b/website/static/favicons/favicon-16x16.png
diff --git a/website/static/favicons/favicon-32x32.png b/website/static/favicons/favicon-32x32.png
diff --git a/website/static/favicons/favicon.ico b/website/static/favicons/favicon.ico