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-10-16 12:42:12 +02:00
2024-09-26 19:27:57 +00:00
2024-09-11 08:01:32 +00:00
2024-09-04 05:12:25 +00:00
2024-09-04 05:12:25 +00:00
2024-12-02 16:20:32 +01:00
2024-09-04 05:12:25 +00:00
2024-09-04 05:12:25 +00:00
2024-09-04 19:38:52 +02:00
2023-11-08 14:43:17 +00:00
2024-10-16 12:40:58 +02:00
2024-09-04 05:12:25 +00:00
2024-10-16 12:40:58 +02:00
2023-11-07 15:47:01 +00:00
2023-05-08 19:28:43 +02:00
2024-09-04 05:12:25 +00:00
2024-09-04 05:12:25 +00:00
2024-09-04 05:12:25 +00:00
2024-09-04 05:12:25 +00:00
2023-05-04 05:49:08 +02:00
2023-06-06 13:58:33 +02:00
2024-09-04 05:12:25 +00:00
2024-09-04 05:12:25 +00:00
2024-06-17 13:41:58 +02:00
2024-09-04 05:12:25 +00:00
2024-07-03 20:05:59 +00:00
2024-09-12 11:14:42 +00:00
2024-09-25 13:35:37 +00:00
2024-07-03 20:05:59 +00:00
2024-09-04 05:12:25 +00:00
2024-09-04 05:12:25 +00:00
2024-09-25 07:56:42 +00:00
2024-09-04 05:12:25 +00:00
2024-12-02 16:20:32 +01:00
2024-03-13 15:42:39 +00:00
2024-09-04 05:12:25 +00:00
2024-09-04 05:12:25 +00:00
2024-09-04 05:12:25 +00:00
2024-09-04 05:12:25 +00:00
2023-06-22 14:55:22 +02:00
2023-06-06 13:58:33 +02:00
2024-07-25 15:02:58 +00:00
2024-09-04 05:12:25 +00:00
2024-07-23 14:42:31 +00:00