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-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-08-07 22:53:15 +00:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-01-15 20:53:08 +01:00
2024-01-15 20:53:08 +01:00
2024-03-15 13:08:38 +00:00
2024-03-15 13:08:38 +00:00
2024-01-25 15:41:31 +00:00
2024-01-25 15:41:31 +00:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-08-07 22:52:08 +00:00
2024-01-15 20:53:08 +01:00
2024-01-15 20:53:08 +01:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-08-07 22:52:08 +00:00
2024-08-07 22:52:08 +00:00
2024-01-15 20:53:08 +01:00
2024-01-15 20:53:08 +01:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-08-07 22:52:08 +00:00
2024-08-07 22:52:08 +00:00
2024-08-07 22:52:08 +00:00
2024-08-07 22:52:08 +00:00
2024-01-15 20:53:08 +01:00
2024-08-07 22:52:08 +00:00
2024-02-06 20:22:42 +01:00
2024-02-06 20:22:42 +01:00
2024-08-07 23:08:36 +00:00
2024-08-07 22:52:08 +00:00
2024-08-07 22:52:08 +00:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-08-07 22:52:08 +00:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-08-07 22:52:08 +00:00
2024-03-15 17:36:41 +00:00
2024-03-15 17:36:41 +00:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-01-15 20:53:08 +01:00
2024-01-15 20:53:08 +01:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-02-20 09:10:44 +00:00
2024-02-20 09:10:44 +00:00
2024-08-07 22:52:08 +00:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-01-15 20:53:08 +01:00
2024-01-15 20:53:08 +01:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-04-26 15:33:15 +00:00
2024-04-26 15:33:15 +00:00
2024-03-15 13:08:38 +00:00
2024-03-15 13:08:38 +00:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-08-07 22:52:08 +00:00
2024-03-22 15:45:04 +00:00
2024-03-22 15:45:04 +00:00
2024-08-07 22:52:08 +00:00
2024-03-15 17:36:41 +00:00
2024-03-15 17:36:41 +00:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-08-07 23:08:36 +00:00
2024-01-15 20:53:08 +01:00
2024-01-15 20:53:08 +01:00
2024-08-07 22:52:08 +00:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-03-19 15:39:26 +00:00
2024-03-19 15:39:26 +00:00
2024-08-07 23:08:36 +00:00
2024-03-20 15:37:21 +00:00
2024-03-20 15:37:21 +00:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-08-07 22:52:08 +00:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-01-15 20:53:08 +01:00
2024-08-07 22:52:08 +00:00
2024-01-15 20:53:08 +01:00
2024-08-07 22:52:08 +00:00
2024-01-15 20:53:08 +01:00
2024-01-15 20:53:08 +01:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-08-07 22:52:08 +00:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-01-15 20:53:08 +01:00
2024-01-15 20:53:08 +01:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-02-01 13:37:04 +00:00
2024-02-01 13:37:04 +00:00
2024-02-01 13:37:04 +00:00
2024-02-01 13:37:04 +00:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-01-15 20:53:08 +01:00
2024-01-15 20:53:08 +01:00
2024-03-15 17:36:41 +00:00
2024-03-15 17:36:41 +00:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-08-07 23:08:36 +00:00
2024-01-25 15:41:31 +00:00
2024-01-25 15:41:31 +00:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-08-07 23:08:36 +00:00
2024-08-07 23:08:36 +00:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-01-25 15:41:31 +00:00
2024-01-25 15:41:31 +00:00
2024-08-07 23:08:36 +00:00
2024-08-07 23:08:36 +00:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-08-07 22:52:08 +00:00
2024-08-07 22:52:08 +00:00
2024-08-07 23:08:36 +00:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-02-23 21:05:33 +01:00
2024-02-23 21:05:33 +01:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-08-07 22:52:08 +00:00
2024-03-15 13:08:38 +00:00
2024-03-15 13:08:38 +00:00
2024-08-07 22:53:15 +00:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-01-25 15:41:31 +00:00
2024-01-25 15:41:31 +00:00
2024-08-07 22:52:08 +00:00
2024-01-15 20:53:08 +01:00
2024-01-15 20:53:08 +01:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-02-06 20:22:42 +01:00
2024-02-06 20:22:42 +01:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-01-25 15:41:31 +00:00
2024-01-25 15:41:31 +00:00