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-14 20:38:32 +01:00
2024-11-12 08:28:31 +00:00
2024-11-19 08:51:34 +00:00
2024-09-04 05:12:25 +00:00
2024-09-04 05:12:25 +00:00
2025-01-10 09:04:23 +00:00
2024-09-04 05:12:25 +00:00
2024-09-04 05:12:25 +00:00
2024-12-25 18:01:37 +01:00
2023-11-08 14:43:17 +00:00
2024-10-15 12:54:56 +00:00
2024-09-04 05:12:25 +00:00
2024-10-15 13:18:57 +00:00
2024-11-04 09:00: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
2024-11-14 13:47:29 +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-12-02 21:08:15 +01:00
2024-09-04 05:12:25 +00:00
2024-07-03 20:05:59 +00:00
2024-11-22 08:00:14 +00:00
2024-09-25 13:35:37 +00:00
2024-10-15 13:58:45 +00:00
2024-09-04 05:12:25 +00:00
2025-01-09 08:35:35 +00:00
2024-09-25 07:56:42 +00:00
2024-09-04 05:12:25 +00:00
2024-11-18 15:42:45 +00: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-12-10 08:41:06 +00:00
2024-09-04 05:12:25 +00:00
2024-07-23 14:42:31 +00:00