Claire
8103e69b17
Merge commit '77cd16f4ee7ab807df6fffb1538a6659a8182a9e' into glitch-soc/merge-upstream
...
Conflicts:
- `app/javascript/styles/mastodon/components.scss`:
Conflict caused by glitch-soc changing the path to images, and upstream
removing styling using such an image.
Removed the styling as upstream did.
- `app/models/account.rb`:
Conflict due to upstream changing lines adjacent to a change made in glitch-soc
to have configurable limits.
Ported upstream's changes.
- `yarn.lock`:
Dependencies adjacent to glitch-soc-only dependencies updated.
Updated them as well.
2024-10-26 13:38:07 +02:00
..
2024-10-14 19:46:52 +02:00
2024-09-26 19:27:57 +00:00
2024-09-04 19:50:33 +00:00
2024-05-24 08:36:21 +00:00
2023-10-03 10:47:50 +02:00
2023-11-06 16:25:40 +00:00
2023-12-18 09:50:51 +00:00
2024-05-24 08:36:21 +00:00
2023-06-01 00:10:21 +02:00
2024-10-06 16:07:58 +02:00
2023-06-06 10:42:47 +02:00
2024-06-11 08:50:51 +00:00
2024-06-11 08:50:51 +00:00
2023-05-12 13:13:04 +02:00
2024-05-01 19:30:41 +02:00
2024-03-14 21:21:01 +00:00
2024-05-24 17:13:34 +02:00
2024-01-24 09:38:10 +00:00
2024-07-04 16:11:28 +02:00
2022-07-13 15:03:28 +02:00
2024-01-15 13:46:47 +00:00
2024-06-21 15:32:49 +00:00
2024-10-19 19:13:32 +02:00
2024-01-24 11:51:09 +00:00
2024-09-08 18:41:37 +00:00
2024-09-10 13:21:40 +00:00
2024-06-18 12:16:16 +00:00
2021-09-29 23:52:36 +02:00
2020-10-12 16:33:49 +02:00
2024-09-21 15:06:06 +02:00
2022-11-10 05:49:30 +01:00
2023-01-20 13:57:32 +01:00
2024-09-18 09:27:43 +00:00
2024-09-12 11:14:42 +00:00
2024-07-26 08:53:10 +00:00
2024-09-25 13:35:37 +00:00
2024-09-08 18:41:37 +00:00
2024-06-27 07:16:59 +00:00
2023-02-18 04:30:23 +01:00
2024-09-02 14:19:55 +00:00
2023-07-13 11:11:55 +02:00
2024-09-20 10:10:09 +00:00
2020-06-30 23:58:02 +02:00
2023-07-04 18:58:23 +02:00
2024-06-06 07:30:10 +00:00
2023-09-08 14:25:00 +02:00
2024-09-12 13:40:20 +00:00
2024-02-07 17:24:42 +00:00
2024-01-19 09:19:48 +00:00
2023-02-20 06:58:28 +01:00
2023-02-18 12:37:47 +01:00
2024-01-12 15:58:28 +00:00
2024-01-24 11:51:09 +00:00
2023-09-19 16:53:58 +02:00
2024-03-13 09:19:54 +00:00
2024-08-20 18:31:50 +02:00
2024-10-23 13:32:18 +00:00
2023-03-30 14:44:00 +02:00
2022-09-27 03:08:19 +02:00
2023-02-22 09:54:36 +09:00
2024-06-07 17:42:43 +00:00
2024-10-02 11:11:52 +00:00
2023-07-27 16:11:17 +02:00
2024-07-23 14:42:31 +00:00