Claire
f5c0c32edd
Merge commit '9ba7c90151463a6e4f7952317253fe8c113e9b0a' into glitch-soc/merge-upstream
...
Conflicts:
- `app/javascript/material-icons/400-24px/chat.svg`:
Glitch-soc used this one but not upstream.
Upstream pulled a presumably more up-to-date version of the file.
Switched to upstream's version.
- `app/views/layouts/application.html.haml`:
Upstream removed use of font-awesome.
I hope we are ready.
- `app/views/layouts/embedded.html.haml`:
Upstream removed use of font-awesome.
I hope we are ready.
- `app/views/layouts/error.html.haml`:
Upstream removed use of font-awesome.
I hope we are ready.
2024-08-20 18:31:50 +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-08-20 11:52:45 +00:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-08-09 14:56:39 +00:00
2024-08-09 14:56:39 +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-20 11:52:45 +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-12 14:45:30 +00:00
2024-08-12 14:45:30 +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-08-20 11:52:45 +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-20 11:48:15 +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-08-09 14:21:55 +00:00
2024-08-09 14:21:55 +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-08-09 14:21:55 +00:00
2024-08-09 14:21:55 +00:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-08-20 11:52:45 +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-08-20 11:52:45 +00:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-08-20 11:48:15 +00:00
2024-08-20 11:48:15 +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