Claire
ab152ebed4
Merge commit 'e1d7efadc04dd0826c6bcfe43325688566e13881' into glitch-soc/merge-upstream
...
Conflicts:
- `app/models/status.rb`:
Upstream refactored `visibility` handling to a concern, while glitch-soc had
custom code adjacent to some of the changed lines.
Applied upstream's changes.
- `lib/mastodon/version.rb`:
Upstream moved some definitions to `config/mastodon.yml`, while glitch-soc's
default github repository had been modified.
Applied upstream's changes and updated `config/mastodon.yml` accordingly.
2025-01-14 20:38:32 +01:00
..
2025-01-06 23:25:13 +00:00
2025-01-13 16:05:24 +00:00
2024-09-20 13:13:04 +00:00
2024-11-12 22:06:13 +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-01-13 12:58:53 +00: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
2024-12-02 15:08:41 +00:00
2024-09-25 17:41:37 +02:00
2024-09-21 15:06:06 +02:00
2024-10-28 04:55:18 +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
2025-01-07 16:28:54 +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-12-17 10:52:59 +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
2025-01-03 08:28:14 +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