Claire
dd2a991e24
Merge commit '079d681ac6f279f3a7a6be5c3734549f3be8f912' into glitch-soc/merge-upstream
...
Conflicts:
- `app/javascript/material-icons/400-24px/code.svg`:
Icon newly-introduced upstream.
Used upstream's more recent version.
- `app/javascript/material-icons/400-24px/mail.svg`:
Icon newly-introduced upstream.
Used upstream's more recent version.
- `app/javascript/material-icons/400-24px/manufacturing.svg`:
Icon newly-introduced upstream.
Used upstream's more recent version.
- `app/views/admin/settings/shared/_links.html.haml`:
Glitch-soc had extra menu items, ported the changes for them too.
- `config/navigation.rb`:
Glitch-soc had extra menu items, ported the changes for them too.
2024-08-08 19:30:16 +02:00
..
2024-08-07 09:32:16 +00:00
2024-08-07 09:32:16 +00:00
2024-08-07 09:32:16 +00:00
2024-08-07 09:32:16 +00:00
2024-08-07 09:32:16 +00:00
2024-08-07 09:32:16 +00:00
2024-08-07 09:32:16 +00:00
2024-08-07 09:32:16 +00:00
2024-03-18 08:47:48 +00:00
2024-08-07 09:32:16 +00:00
2024-08-07 09:32:16 +00:00
2024-08-07 09:32:16 +00:00
2024-08-07 09:32:16 +00:00
2024-08-07 09:32:16 +00:00
2024-08-08 13:54:10 +00:00
2024-08-07 09:32:16 +00:00
2024-08-08 13:54:10 +00:00
2024-08-07 09:32:16 +00:00
2024-08-08 09:16:33 +00:00
2024-08-07 09:32:16 +00:00
2024-08-08 13:54:10 +00:00
2024-08-07 09:32:16 +00:00
2024-08-07 09:32:16 +00:00
2024-08-07 09:32:16 +00:00
2024-08-07 09:32:16 +00:00
2024-08-07 09:32:16 +00:00
2024-08-08 13:54:10 +00:00
2024-08-07 09:32:16 +00:00
2024-08-07 09:32:16 +00:00
2024-08-07 09:32:16 +00:00
2024-08-07 09:32:16 +00:00
2024-08-07 09:32:16 +00:00
2024-08-07 09:32:16 +00:00
2024-08-07 09:32:16 +00:00
2024-08-07 09:32:16 +00:00
2023-10-31 16:05:44 +00:00
2024-08-07 09:32:16 +00:00
2024-08-07 09:32:16 +00:00
2024-08-07 09:32:16 +00:00
2024-08-07 09:32:16 +00:00
2024-08-07 09:32:16 +00:00
2024-08-07 09:32:16 +00:00
2024-08-07 09:32:16 +00:00
2024-08-07 09:32:16 +00:00
2024-06-17 12:13:23 +00:00
2023-06-02 15:00:27 +02:00
2023-10-31 16:05:44 +00:00
2024-08-07 09:32:16 +00:00
2024-08-07 09:32:16 +00:00
2024-08-07 09:32:16 +00:00
2024-08-07 09:32:16 +00:00
2024-08-07 09:32:16 +00:00
2024-08-08 13:54:10 +00:00
2024-08-07 09:32:16 +00:00
2024-08-07 09:32:16 +00:00
2024-08-08 13:54:10 +00:00
2024-08-07 09:32:16 +00:00
2024-08-07 09:32:16 +00:00
2024-08-07 09:32:16 +00:00
2024-08-07 09:32:16 +00:00
2023-07-13 14:22:20 +02:00
2024-08-07 09:32:16 +00:00
2024-08-07 09:32:16 +00:00
2024-08-07 09:32:16 +00:00
2024-08-07 09:32:16 +00:00
2024-08-07 09:32:16 +00:00
2024-08-07 09:32:16 +00:00
2024-08-07 09:32:16 +00:00
2024-06-27 08:00:04 +00:00
2024-08-07 09:32:16 +00:00
2024-08-07 09:32:16 +00:00
2024-08-07 09:32:16 +00:00
2024-08-07 09:32:16 +00:00
2024-08-07 09:32:16 +00:00
2024-08-07 09:32:16 +00:00
2024-08-07 09:32:16 +00:00
2024-08-07 09:32:16 +00:00
2024-08-07 09:32:16 +00:00
2024-08-07 09:32:16 +00:00
2024-08-07 09:32:16 +00:00
2024-08-07 09:32:16 +00:00
2024-08-07 09:32:16 +00:00
2024-08-07 09:32:16 +00:00
2024-08-07 09:32:16 +00:00
2024-08-07 09:32:16 +00:00
2024-08-07 09:32:16 +00:00
2024-08-07 09:32:16 +00:00
2024-08-07 09:32:16 +00:00
2024-08-07 09:32:16 +00:00
2024-08-07 09:32:16 +00:00
2024-08-07 09:32:16 +00:00
2024-08-07 09:32:16 +00:00
2024-06-27 08:00:04 +00:00
2024-07-26 07:51:37 +00:00
2024-08-07 09:32:16 +00:00
2023-12-05 16:07:53 +00:00
2024-08-07 09:32:16 +00:00
2024-08-07 09:32:16 +00:00
2024-08-07 09:32:16 +00:00
2024-06-27 08:00:04 +00:00
2024-08-07 09:32:16 +00:00
2024-08-07 09:32:16 +00:00
2024-08-07 09:32:16 +00:00
2024-08-07 09:32:16 +00:00
2024-08-07 09:32:16 +00:00
2024-08-08 13:54:10 +00:00
2024-08-07 09:32:16 +00:00
2024-08-07 09:32:16 +00:00