Claire
0d69cc068c
Merge commit '26f25ef4bafd5ad84d03d8cb7ad0d868360175e5' into glitch-soc/stable-4.3
...
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/trends/statuses.rb`:
Upstream added a date restriction to trendable posts, while glitch-soc had
slightly different conditions.
Added the date restriction to glitch-soc's conditions.
2024-12-02 21:49:12 +01: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-12-02 16:20:32 +01: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-12-02 16:20:32 +01:00
2024-09-20 13:13:04 +00:00
2024-09-20 13:13:04 +00:00
2024-12-02 16:20:32 +01: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