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-22 08:04:56 +00:00
2024-09-23 08:50:19 +00:00
2024-10-17 08:21:51 +00:00
2024-10-17 08:21:51 +00:00
2024-10-17 08:21:51 +00:00
2024-10-17 08:21:51 +00:00
2024-09-13 08:41:46 +00:00
2024-10-17 08:21:51 +00:00
2024-03-18 08:47:48 +00:00
2024-10-17 08:21:51 +00:00
2024-10-17 08:21:51 +00:00
2024-09-23 08:50:19 +00:00
2024-10-17 08:21:51 +00:00
2024-10-18 07:56:43 +00:00
2024-10-17 08:21:51 +00:00
2024-10-17 08:21:51 +00:00
2024-10-17 08:21:51 +00:00
2024-10-17 08:21:51 +00:00
2024-10-23 09:47:23 +00:00
2024-10-17 08:21:51 +00:00
2024-10-17 08:21:51 +00:00
2024-10-17 08:21:51 +00:00
2024-10-17 08:21:51 +00:00
2024-10-17 08:21:51 +00:00
2024-10-17 08:21:51 +00:00
2024-10-17 08:21:51 +00:00
2024-10-17 08:21:51 +00:00
2024-10-17 08:21:51 +00:00
2024-10-17 08:21:51 +00:00
2024-10-17 08:21:51 +00:00
2024-10-17 08:21:51 +00:00
2024-10-17 08:21:51 +00:00
2024-10-17 08:21:51 +00:00
2024-10-17 08:21:51 +00:00
2024-10-17 08:21:51 +00:00
2023-10-31 16:05:44 +00:00
2024-10-18 07:56:43 +00:00
2024-10-17 08:21:51 +00:00
2024-09-13 08:41:46 +00:00
2024-10-17 08:21:51 +00:00
2024-09-23 08:50:19 +00:00
2024-10-17 08:21:51 +00:00
2024-10-17 08:21:51 +00:00
2024-10-17 08:21:51 +00:00
2024-10-17 08:21:51 +00:00
2023-06-02 15:00:27 +02:00
2024-09-11 13:59:46 +00:00
2024-10-17 08:21:51 +00:00
2024-10-17 08:21:51 +00:00
2024-10-18 07:56:43 +00:00
2024-10-18 07:56:43 +00:00
2024-09-13 08:41:46 +00:00
2024-10-17 08:21:51 +00:00
2024-09-13 08:41:46 +00:00
2024-08-22 08:04:56 +00:00
2024-10-17 08:21:51 +00:00
2024-09-23 08:50:19 +00:00
2024-09-23 08:50:19 +00:00
2024-09-26 08:47:38 +00:00
2024-10-17 08:21:51 +00:00
2023-07-13 14:22:20 +02:00
2024-10-17 08:21:51 +00:00
2024-10-17 08:21:51 +00:00
2024-08-22 08:04:56 +00:00
2024-10-18 07:56:43 +00:00
2024-09-23 08:50:19 +00:00
2024-10-17 08:21:51 +00:00
2024-09-23 08:50:19 +00:00
2024-08-22 08:04:56 +00:00
2024-10-17 08:21:51 +00:00
2024-10-17 08:21:51 +00:00
2024-10-17 08:21:51 +00:00
2024-10-15 09:26:28 +00:00
2024-09-13 08:41:46 +00:00
2024-10-17 08:21:51 +00:00
2024-10-17 08:21:51 +00:00
2024-10-17 08:21:51 +00:00
2024-10-17 08:21:51 +00:00
2024-10-17 08:21:51 +00:00
2024-10-17 08:21:51 +00:00
2024-09-23 08:50:19 +00:00
2024-10-17 08:21:51 +00:00
2024-09-23 08:50:19 +00:00
2024-09-13 08:41:46 +00:00
2024-10-17 08:21:51 +00:00
2024-10-17 08:21:51 +00:00
2024-10-17 08:21:51 +00:00
2024-10-17 08:21:51 +00:00
2024-10-17 08:21:51 +00:00
2024-10-17 08:21:51 +00:00
2024-08-22 08:04:56 +00:00
2024-09-13 08:41:46 +00:00
2024-08-22 08:04:56 +00:00
2024-09-13 08:41:46 +00:00
2024-10-17 08:21:51 +00:00
2023-12-05 16:07:53 +00:00
2024-10-17 08:21:51 +00:00
2024-10-17 08:21:51 +00:00
2024-09-23 08:50:19 +00:00
2024-08-22 08:04:56 +00:00
2024-10-17 08:21:51 +00:00
2024-08-22 08:04:56 +00:00
2024-09-11 08:18:10 +00:00
2024-10-17 08:21:51 +00:00
2024-09-11 08:18:10 +00:00
2024-10-17 08:21:51 +00:00
2024-10-17 08:21:51 +00:00
2024-10-17 08:21:51 +00:00