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-08-07 09:32:16 +00:00
2024-08-11 18:13:10 +00:00
2024-08-20 07:59:21 +00:00
2024-08-11 18:13:10 +00:00
2024-08-20 07:59:21 +00:00
2024-08-20 07:59:21 +00:00
2024-08-11 18:13:10 +00:00
2024-08-11 18:13:10 +00:00
2024-03-18 08:47:48 +00:00
2024-08-20 07:59:21 +00:00
2024-08-11 18:13:10 +00:00
2024-08-11 18:13:10 +00:00
2024-08-11 18:13:10 +00:00
2024-08-20 07:59:21 +00:00
2024-08-20 07:59:21 +00:00
2024-08-20 07:59:21 +00:00
2024-08-20 07:59:21 +00:00
2024-08-20 07:59:21 +00:00
2024-08-19 22:11:58 +00:00
2024-08-19 08:29:48 +00:00
2024-08-20 07:59:21 +00:00
2024-08-20 07:59:21 +00:00
2024-08-20 07:59:21 +00:00
2024-08-11 18:13:10 +00:00
2024-08-20 07:59:21 +00:00
2024-08-11 18:13:10 +00:00
2024-08-20 07:59:21 +00:00
2024-08-11 18:13:10 +00:00
2024-08-20 07:59:21 +00:00
2024-08-20 07:59:21 +00:00
2024-08-20 07:59:21 +00:00
2024-08-11 18:13:10 +00:00
2024-08-20 07:59:21 +00:00
2024-08-20 07:59:21 +00:00
2024-08-20 07:59:21 +00:00
2023-10-31 16:05:44 +00:00
2024-08-20 07:59:21 +00:00
2024-08-07 09:32:16 +00:00
2024-08-11 18:13:10 +00:00
2024-08-20 07:59:21 +00:00
2024-08-11 18:13:10 +00:00
2024-08-11 18:13:10 +00:00
2024-08-11 18:13:10 +00:00
2024-08-11 18:13:10 +00:00
2024-08-20 07:59:21 +00:00
2023-06-02 15:00:27 +02:00
2023-10-31 16:05:44 +00:00
2024-08-11 18:13:10 +00:00
2024-08-20 07:59:21 +00:00
2024-08-20 07:59:21 +00:00
2024-08-11 18:13:10 +00:00
2024-08-11 18:13:10 +00:00
2024-08-20 07:59:21 +00:00
2024-08-11 18:13:10 +00:00
2024-08-07 09:32:16 +00:00
2024-08-20 07:59:21 +00:00
2024-08-11 18:13:10 +00:00
2024-08-11 18:13:10 +00:00
2024-08-13 07:42:08 +00:00
2024-08-20 07:59:21 +00:00
2023-07-13 14:22:20 +02:00
2024-08-20 07:59:21 +00:00
2024-08-11 18:13:10 +00:00
2024-08-07 09:32:16 +00:00
2024-08-11 18:13:10 +00:00
2024-08-07 09:32:16 +00:00
2024-08-11 18:13:10 +00:00
2024-08-11 18:13:10 +00:00
2024-06-27 08:00:04 +00:00
2024-08-20 07:59:21 +00:00
2024-08-20 07:59:21 +00:00
2024-08-11 18:13:10 +00:00
2024-08-11 18:13:10 +00:00
2024-08-07 09:32:16 +00:00
2024-08-20 07:59:21 +00:00
2024-08-20 07:59:21 +00:00
2024-08-11 18:13:10 +00:00
2024-08-11 18:13:10 +00:00
2024-08-12 07:22:50 +00:00
2024-08-07 09:32:16 +00:00
2024-08-11 18:13:10 +00:00
2024-08-16 09:11:33 +00:00
2024-08-11 18:13:10 +00:00
2024-08-11 18:13:10 +00:00
2024-08-20 07:59:21 +00:00
2024-08-20 07:59:21 +00:00
2024-08-20 07:59:21 +00:00
2024-08-11 18:13:10 +00:00
2024-08-11 18:13:10 +00:00
2024-08-20 07:59:21 +00:00
2024-08-07 09:32:16 +00:00
2024-08-11 18:13:10 +00:00
2024-06-27 08:00:04 +00:00
2024-08-11 18:13:10 +00:00
2024-08-20 07:59:21 +00:00
2023-12-05 16:07:53 +00:00
2024-08-11 18:13:10 +00:00
2024-08-20 07:59:21 +00:00
2024-08-07 09:32:16 +00:00
2024-06-27 08:00:04 +00:00
2024-08-20 07:59:21 +00:00
2024-08-11 18:13:10 +00:00
2024-08-07 09:32:16 +00:00
2024-08-20 07:59:21 +00:00
2024-08-07 09:32:16 +00:00
2024-08-20 07:59:21 +00:00
2024-08-11 18:13:10 +00:00
2024-08-20 07:59:21 +00:00