Merge branch 'main' into glitch-soc/merge-upstream

Conflicts:
- `README.md`:
  Our README is completely different. Discarded upstream changes.
- `app/javascript/packs/mailer.js`:
  We had removed the file. Move the changes to `app/javascript/core/mailer.js`.

12 files changed, 0 insertions, 10 deletions

diff --git a/public/android-chrome-192x192.png b/public/android-chrome-192x192.png
deleted file mode 100644
index 7a99a1964..000000000
--- a/public/android-chrome-192x192.png
+++ /dev/null
Binary files differdiff --git a/public/apple-touch-icon.png b/public/apple-touch-icon.png
deleted file mode 100644
index b12aa55a3..000000000
--- a/public/apple-touch-icon.png
+++ /dev/null
Binary files differdiff --git a/public/badge.png b/public/badge.png
index c3e99ddd4..0449e9292 100644
--- a/public/badge.png
+++ b/public/badge.png
Binary files differdiff --git a/public/browserconfig.xml b/public/browserconfig.xml
deleted file mode 100644
index 7fdab5058..000000000
--- a/public/browserconfig.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<browserconfig>
-  <msapplication>
-    <tile>
-      <square150x150logo src="/mstile-150x150.png"/>
-      <TileColor>#282c37</TileColor>
-    </tile>
-  </msapplication>
-</browserconfig>
diff --git a/public/favicon-dev.ico b/public/favicon-dev.ico
deleted file mode 100644
index 383604406..000000000
--- a/public/favicon-dev.ico
+++ /dev/null
Binary files differdiff --git a/public/favicon.ico b/public/favicon.ico
index 79000c9cc..ccccbfc1c 100644
--- a/public/favicon.ico
+++ b/public/favicon.ico
Binary files differdiff --git a/public/mask-icon.svg b/public/mask-icon.svg
deleted file mode 100644
index f91ff5067..000000000
--- a/public/mask-icon.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 94.023018 100.80365" height="28.44903mm" width="26.535385mm"><path d="M72.57077 49.00625c-3.9125 0-7.085-3.1825-7.085-7.095 0-3.91125 3.1725-7.09375 7.085-7.09375 3.92125 0 7.09375 3.1825 7.09375 7.09375 0 3.9125-3.1725 7.095-7.09375 7.095m-25.55875 0c-3.9225 0-7.095-3.1825-7.095-7.095 0-3.91125 3.1725-7.09375 7.095-7.09375 3.91125 0 7.09375 3.1825 7.09375 7.09375 0 3.9125-3.1825 7.095-7.09375 7.095m-25.57 0c-3.91125 0-7.08375-3.1825-7.08375-7.095 0-3.91125 3.1725-7.09375 7.08375-7.09375 3.92125 0 7.09375 3.1825 7.09375 7.09375 0 3.9125-3.1725 7.095-7.09375 7.095m72.5775-15.905c0-21.86625-14.32375-28.27375-14.32375-28.27375-7.23-3.31875-19.63-4.7125-32.5175-4.8275h-.3125c-12.88875.115-25.28875 1.50875-32.5075 4.8275 0 0-14.32375 6.4075-14.32375 28.27375 0 5.00375-.105 10.995.05125 17.34C.60577 71.83 4.00702 92.905 23.78327 98.1375c9.1125 2.4125 16.945 2.9125 23.24875 2.56875 11.4225-.63375 17.84-4.07625 17.84-4.07625l-.37375-8.3025s-8.16625 2.58-17.34125 2.2675c-9.09125-.3125-18.6825-.9775-20.16-12.13875-.135-.97875-.1975-2.02875-.1975-3.13125 0 0 8.915 2.185 20.2325 2.69375 6.9075.3225 13.39875-.39375 19.98375-1.185 12.6275-1.50875 23.62375-9.29 25.0075-16.405 2.17375-11.1925 1.99625-27.3275 1.99625-27.3275" fill="#000"/></svg>
diff --git a/public/mstile-150x150.png b/public/mstile-150x150.png
deleted file mode 100644
index a4994062d..000000000
--- a/public/mstile-150x150.png
+++ /dev/null
Binary files differdiff --git a/public/shortcuts/direct.png b/public/shortcuts/direct.png
deleted file mode 100644
index e8772c00e..000000000
--- a/public/shortcuts/direct.png
+++ /dev/null
Binary files differdiff --git a/public/shortcuts/new-status.png b/public/shortcuts/new-status.png
deleted file mode 100644
index b7095f3c4..000000000
--- a/public/shortcuts/new-status.png
+++ /dev/null
Binary files differdiff --git a/public/shortcuts/notifications.png b/public/shortcuts/notifications.png
deleted file mode 100644
index 6b9d45718..000000000
--- a/public/shortcuts/notifications.png
+++ /dev/null
Binary files differdiff --git a/public/shortcuts/profile.png b/public/shortcuts/profile.png
deleted file mode 100644
index 0b3bf517d..000000000
--- a/public/shortcuts/profile.png
+++ /dev/null
Binary files differ