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-25 17:41:37 +02:00
2024-09-23 09:27:53 +00:00
2024-09-20 13:13:04 +00:00
2024-09-23 08:42:52 +00:00
2024-10-23 06:40:29 +00:00
2024-09-20 13:13:04 +00:00
2024-09-20 13:13:04 +00:00
2024-09-20 13:13:04 +00:00
2024-09-20 13:13:04 +00:00
2024-09-20 13:13:04 +00:00
2024-09-25 13:54:22 +00:00
2024-09-20 13:13:04 +00:00
2024-09-20 13:13:04 +00:00
2024-09-25 17:41:37 +02:00
2024-09-21 15:06:06 +02:00
2024-09-20 13:13:04 +00:00
2024-10-07 12:05:46 +00:00
2024-09-20 13:13:04 +00:00
2024-09-20 13:13:04 +00:00
2024-09-20 13:13:04 +00:00
2024-09-20 13:13:04 +00:00
2024-09-20 13:13:04 +00:00
2024-09-20 13:13:04 +00:00
2024-09-04 05:12:25 +00:00
2024-09-20 13:13:04 +00:00
2024-09-25 13:54:22 +00:00
2024-09-20 13:13:04 +00:00
2024-09-20 13:13:04 +00:00
2024-09-20 13:13:04 +00:00
2024-09-20 13:13:04 +00:00
2024-09-20 13:13:04 +00:00
2024-09-20 13:13:04 +00:00
2024-09-20 13:13:04 +00:00
2024-09-21 15:06:06 +02:00
2024-09-20 13:13:04 +00:00
2024-09-20 13:13:04 +00:00
2024-09-20 13:13:04 +00:00
2024-09-20 13:13:04 +00:00
2024-09-20 13:13:04 +00:00
2024-09-20 13:13:04 +00:00
2024-09-20 13:13:04 +00:00
2024-09-20 13:13:04 +00:00
2024-09-20 13:13:04 +00:00
2024-09-20 13:13:04 +00:00
2024-09-20 13:13:04 +00:00
2024-09-20 13:13:04 +00:00
2024-09-20 13:13:04 +00:00
2024-09-20 13:13:04 +00:00