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