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-03-12 09:51:30 +00:00
2024-09-25 16:36:19 +00:00
2024-09-26 13:26:49 +00:00
2024-08-21 07:08:58 +00:00
2024-01-16 10:27:26 +00:00
2024-01-16 10:27:26 +00:00
2024-01-16 10:27:26 +00:00
2023-05-23 17:15:17 +02:00
2024-10-18 07:40:08 +00:00
2024-10-19 19:13:32 +02:00
2024-09-05 09:39:59 +00:00
2024-09-19 15:34:08 +00:00
2024-07-25 17:05:54 +00:00
2024-05-27 09:24:59 +00:00
2024-07-01 14:45:48 +00:00
2024-01-16 10:27:26 +00:00
2024-01-16 10:27:26 +00:00
2024-01-16 10:27:26 +00:00
2024-05-19 17:07:32 +00:00
2024-03-20 17:21:03 +00:00
2024-01-16 10:27:26 +00:00
2024-08-21 07:08:58 +00:00
2024-08-21 07:08:58 +00:00
2024-08-26 16:42:46 +00:00
2024-05-24 08:25:42 +00:00
2024-10-15 09:38:04 +00:00
2024-09-11 13:59:46 +00:00
2024-04-12 09:42:12 +00:00
2024-08-19 14:41:32 +00:00
2024-01-16 10:27:26 +00:00
2024-01-16 10:27:26 +00:00
2024-07-25 17:05:54 +00:00
2024-01-16 10:27:26 +00:00
2024-01-16 10:27:26 +00:00
2024-10-16 08:33:11 +00:00
2024-10-21 08:03:44 +00:00
2024-09-12 12:54:16 +00:00
2024-10-15 10:01:21 +00:00
2024-01-16 10:27:26 +00:00
2023-05-23 17:15:17 +02:00
2024-05-19 17:07:32 +00:00
2024-01-16 10:27:26 +00:00
2024-01-16 10:27:26 +00:00
2024-09-12 09:41:19 +00:00
2024-09-26 12:31:32 +00:00
2024-01-16 10:27:26 +00:00
2024-10-16 07:27:44 +00:00
2024-01-16 10:27:26 +00:00
2024-09-16 13:12:10 +00:00