Claire
bceb45adda
Merge commit '3f6887557b23d363e7f8f18518db4447739d64bb' into glitch-soc/merge-upstream
...
Conflicts:
- `app/javascript/entrypoints/common.js`:
Upstream moved everything from `app/javascript/packs` to
`app/javascript/entrypoints` while this file was a glitch-soc
addition. Moved it like the rest.
- `tsconfig.json`:
Conflict due to glitch-soc's flavor.
Updated like upstream.
Also moved and updated the following files accordingly:
- `app/javascript/flavours/vanilla/theme.yml`
- `app/javascript/flavours/glitch/theme.yml`
- everything in `app/javascript/flavours/glitch/packs`
2024-05-04 14:59:00 +02:00
..
2023-12-20 22:25:23 +01:00
2023-07-12 09:47:08 +02:00
2024-01-03 10:23:58 +00:00
2023-08-02 19:32:48 +02:00
2023-12-18 09:32:02 +00:00
2023-07-12 09:47:08 +02:00
2024-04-17 09:19:02 +00:00
2024-03-21 14:12:50 +00:00
2024-04-19 20:33:00 +00:00
2020-06-27 20:20:11 +02:00
2023-08-18 08:18:40 +02:00
2023-07-12 09:47:08 +02:00
2024-02-12 09:54:06 +00:00
2024-01-17 09:22:16 +00:00
2023-12-12 12:01:08 +00:00
2023-07-12 09:47:08 +02:00
2023-10-25 13:56:09 +00:00
2024-01-17 09:08:17 +00:00
2024-04-23 11:47:00 +00:00
2023-07-12 09:47:08 +02:00
2024-04-22 09:00:24 +00:00
2023-10-25 13:56:09 +00:00
2024-04-19 20:33:00 +00:00
2023-07-12 09:47:08 +02:00
2024-03-01 17:51:22 +00:00
2023-11-30 13:55:20 +00:00
2023-10-31 15:21:23 +00:00
2023-10-31 15:21:23 +00:00
2020-04-03 13:06:34 +02:00
2022-10-19 22:08:10 +02:00
2023-07-12 09:47:08 +02:00
2023-09-04 09:46:33 +02:00
2024-01-09 12:50:57 +00:00
2023-07-12 09:47:08 +02:00
2024-03-11 15:14:55 +00:00
2023-07-12 09:47:08 +02:00
2024-04-19 20:37:18 +00:00
2023-10-25 13:56:09 +00:00
2023-07-12 09:47:08 +02:00
2023-07-12 09:47:08 +02:00
2024-04-15 09:16:59 +00:00
2024-04-23 16:43:49 +00:00
2023-07-12 09:47:08 +02:00
2024-04-19 20:33:00 +00:00
2023-07-12 09:47:08 +02:00
2023-09-28 15:48:47 +02:00
2024-02-06 21:00:09 +01:00
2023-12-21 19:24:10 +01:00
2023-08-03 20:28:14 +02:00
2024-04-02 15:47:40 +00:00
2023-10-26 20:35:15 +00:00
2021-04-09 02:31:20 +02:00
2023-12-15 14:33:56 +00:00
2023-07-28 23:11:45 +02:00
2024-04-19 20:33:00 +00:00
2023-07-12 09:47:08 +02:00