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
..
2024-12-09 22:42:45 +00:00
2024-12-12 17:12:33 +00:00
2024-09-26 13:26:49 +00:00
2024-12-12 17:12:33 +00:00
2024-12-03 08:57:29 +00:00
2024-01-16 10:27:26 +00:00
2024-12-03 09:42:52 +00:00
2024-01-16 10:27:26 +00:00
2023-05-23 17:15:17 +02:00
2024-10-18 07:40:08 +00:00
2024-12-25 18:01:37 +01:00
2024-09-05 09:39:59 +00:00
2024-12-02 20:07:48 +00:00
2024-07-25 17:05:54 +00:00
2024-12-09 22:42:45 +00:00
2024-12-12 17:12:33 +00:00
2024-01-16 10:27:26 +00:00
2024-12-03 09:42:52 +00:00
2024-01-16 10:27:26 +00:00
2024-11-29 16:44:05 +00:00
2024-11-07 11:45:46 +00:00
2024-01-16 10:27:26 +00:00
2024-12-03 09:42:52 +00:00
2024-12-03 09:42:52 +00:00
2025-01-09 14:22:33 +00:00
2024-12-06 08:42:24 +00:00
2024-11-26 16:10:12 +00:00
2024-12-17 12:36:32 +00:00
2025-01-03 09:24:50 +00:00
2024-12-02 20:07:48 +00:00
2024-11-21 16:10:04 +00:00
2024-11-21 16:10:04 +00:00
2024-12-03 09:42:52 +00:00
2024-12-03 09:42:52 +00:00
2025-01-06 18:22:07 +00:00
2024-12-11 10:25:51 +00:00
2025-01-14 13:10:48 +00:00
2025-01-02 13:52:07 +00:00
2024-01-16 10:27:26 +00:00
2024-12-09 10:04:46 +00:00
2024-11-29 16:44:05 +00:00
2024-12-03 09:42:52 +00:00
2024-01-16 10:27:26 +00:00
2024-12-12 17:12:33 +00:00
2024-12-09 22:42:45 +00:00
2025-01-03 09:24:50 +00:00
2024-11-22 22:23:02 +00:00
2024-12-09 10:04:46 +00:00
2025-01-14 13:10:48 +00:00
2024-01-16 10:27:26 +00:00