Claire
3a31ef11cc
Merge commit 'db0cd9489c70e985da961a585f3a809ca449dccf' into glitch-soc/merge-upstream
...
Conflicts:
- `app/services/post_status_service.rb`:
Upstream updated the logic to move the CW to the text content.
Glitch-soc does not move CW to text content but has some logic
to avoid the text being empty. Update the logic according to upstream's
change.
- `docker-compose.yml`:
Conflict because of different paths for composer images.
Updated version as upstream did while keeping our path.
2025-09-17 20:10:28 +02:00
..
2025-08-29 08:14:23 +00:00
2025-01-13 16:05:24 +00:00
2024-09-20 13:13:04 +00:00
2025-05-30 07:00:33 +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
2025-02-27 15:49:57 +01:00
2024-11-28 10:13:06 +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
2025-07-24 07:49:20 +00:00
2025-08-18 13:44:06 +02:00
2025-06-13 18:07:59 +02:00
2025-03-25 12:30:10 +00:00
2025-09-05 12:44:09 +00:00
2024-09-20 13:13:04 +00:00
2024-09-20 13:13:04 +00:00
2025-05-30 07:00:33 +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
2025-04-25 15:12:05 +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
2025-04-14 21:11:10 +00:00
2024-09-20 13:13:04 +00:00
2025-02-28 13:41:42 +00:00
2024-09-20 13:13:04 +00:00
2024-09-20 13:13:04 +00:00
2025-01-16 09:00:04 +00:00
2024-09-20 13:13:04 +00:00
2025-03-11 16:17:17 +00:00
2025-01-03 08:28:14 +00:00
2024-09-20 13:13:04 +00:00
2025-09-17 12:19:00 +00:00
2024-09-20 13:13:04 +00:00
2024-09-20 13:13:04 +00:00
2025-04-25 15:12:05 +00:00
2025-03-25 12:30:10 +00:00