Merge branch 'develop'

httpjamesm · Jan 13, 2023 · 22f6fb1 · 22f6fb1
2 parents f4c66c3 + a9562d9
commit 22f6fb1
Show file tree

Hide file tree

Showing 22 changed files with 0 additions and 9 deletions.
diff --git a/src-tauri/icons/128x128.png b/src-tauri/icons/128x128.png
diff --git a/src-tauri/icons/[email protected] b/src-tauri/icons/[email protected]
diff --git a/src-tauri/icons/32x32.png b/src-tauri/icons/32x32.png
diff --git a/src-tauri/icons/Square107x107Logo.png b/src-tauri/icons/Square107x107Logo.png
diff --git a/src-tauri/icons/Square142x142Logo.png b/src-tauri/icons/Square142x142Logo.png
diff --git a/src-tauri/icons/Square150x150Logo.png b/src-tauri/icons/Square150x150Logo.png
diff --git a/src-tauri/icons/Square284x284Logo.png b/src-tauri/icons/Square284x284Logo.png
diff --git a/src-tauri/icons/Square30x30Logo.png b/src-tauri/icons/Square30x30Logo.png
diff --git a/src-tauri/icons/Square310x310Logo.png b/src-tauri/icons/Square310x310Logo.png
diff --git a/src-tauri/icons/Square44x44Logo.png b/src-tauri/icons/Square44x44Logo.png
diff --git a/src-tauri/icons/Square71x71Logo.png b/src-tauri/icons/Square71x71Logo.png
diff --git a/src-tauri/icons/Square89x89Logo.png b/src-tauri/icons/Square89x89Logo.png
diff --git a/src-tauri/icons/StoreLogo.png b/src-tauri/icons/StoreLogo.png
diff --git a/src-tauri/icons/icon.icns b/src-tauri/icons/icon.icns
diff --git a/src-tauri/icons/icon.ico b/src-tauri/icons/icon.ico
diff --git a/src-tauri/icons/icon.png b/src-tauri/icons/icon.png
diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json
@@ -46,7 +46,6 @@
             "icon": [
                 "icons/32x32.png",
                 "icons/128x128.png",
-                "icons/[email protected]",
                 "icons/icon.icns",
                 "icons/icon.ico"
             ],

diff --git a/static/background.jpg b/static/background.jpg
diff --git a/static/favicon.png b/static/favicon.png
diff --git a/static/svelte.svg b/static/svelte.svg
diff --git a/static/tauri.svg b/static/tauri.svg
diff --git a/static/vite.svg b/static/vite.svg