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