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-05-01 17:22:02 +02:00
2023-10-03 10:09:00 +02:00
2023-02-18 04:30:23 +01:00
2024-04-02 15:47:40 +00:00
2024-10-02 12:26:16 +00:00
2024-10-23 08:02:31 +00:00
2023-06-06 10:42:47 +02:00
2023-11-30 15:43:26 +00:00
2020-12-18 23:26:26 +01:00
2023-08-21 16:09:26 +02:00
2023-08-27 22:38:01 +02:00
2020-07-15 21:08:19 +02:00
2020-12-26 23:52:46 +01:00
2023-02-19 07:09:40 +09:00
2023-05-02 12:08:48 +02:00
2020-11-19 17:38:06 +01:00
2020-10-13 01:01:14 +02:00
2023-05-02 18:16:07 +02:00
2020-06-09 10:32:00 +02:00
2020-06-09 10:32:00 +02:00
2023-07-13 13:35:15 +02:00
2023-02-10 22:16:37 +01:00
2024-10-02 12:26:16 +00:00
2024-01-24 09:38:10 +00:00
2023-05-02 12:08:48 +02:00
2024-01-16 08:35:54 +00:00
2022-02-11 22:20:19 +01:00
2024-10-02 08:08:02 +00:00
2023-07-12 17:06:00 +02:00
2024-01-25 12:37:07 +00:00
2020-09-08 03:41:16 +02:00
2023-03-29 10:52:40 +02:00
2023-05-19 17:13:29 +02:00
2020-07-01 19:05:21 +02:00
2020-07-01 19:05:21 +02:00
2023-10-03 10:09:00 +02:00
2023-07-27 16:19:33 +02:00
2023-07-27 16:19:33 +02:00
2021-05-11 14:19:22 +02:00
2021-05-11 14:19:22 +02:00
2021-05-05 23:46:59 +02:00
2024-10-08 14:59:51 +00:00
2023-07-12 17:06:00 +02:00
2022-01-17 00:49:55 +01:00
2022-10-22 18:30:55 +02:00
2023-08-24 16:40:04 +02:00
2023-10-03 10:09:00 +02:00
2023-07-17 13:56:28 +02:00
2023-11-02 14:58:37 +00:00
2022-06-09 21:57:36 +02:00
2024-08-19 15:59:06 +00:00
2023-03-03 21:13:55 +01:00
2023-07-12 17:06:00 +02:00
2020-07-01 19:05:21 +02:00
2023-10-03 10:09:00 +02:00