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-11-18 14:58:45 +00:00
2024-08-02 06:54:48 +00:00
2024-05-17 13:46:12 +00:00
2024-09-25 18:13:36 +00:00
2023-07-02 00:05:44 +02:00
2024-11-18 09:23:38 +00:00
2024-12-09 10:04:46 +00:00
2024-11-19 10:04:12 +00:00
2024-10-09 17:29:02 +00:00
2024-09-20 08:31:58 +00:00
2024-12-20 15:15:11 +00:00
2023-08-21 15:47:09 +02:00
2025-01-14 09:14:00 +00:00
2024-10-15 13:26:20 +00:00
2024-07-04 17:12:14 +02:00
2024-12-25 18:01:37 +01:00
2024-10-31 15:12:08 +00:00
2023-02-19 07:09:40 +09:00
2024-11-05 14:40:07 +00:00
2024-05-17 13:46:12 +00:00
2024-05-30 14:56:48 +00:00
2024-05-30 14:56:48 +00:00
2024-05-30 14:56:48 +00:00
2023-04-28 10:01:38 +02:00
2024-01-23 11:41:54 +00:00
2024-05-30 14:56:48 +00:00
2024-05-30 14:56:48 +00:00
2024-05-30 14:56:48 +00:00
2023-05-23 14:27:37 +02:00
2023-04-30 06:46:39 +02:00
2024-10-31 15:12:08 +00:00
2024-05-30 14:56:48 +00:00
2024-06-03 07:16:29 +00:00
2023-11-13 13:27:00 +00:00
2023-06-05 09:37:02 +02:00
2024-01-15 09:47:25 +00:00
2023-05-05 14:41:07 +02:00
2024-05-30 14:56:48 +00:00
2024-07-30 20:47:34 +02:00
2024-12-20 15:15:11 +00:00
2024-07-16 13:23:08 +00:00
2024-07-04 16:26:49 +02:00
2024-06-06 12:27:26 +02:00
2024-01-10 15:05:46 +00:00
2023-12-19 10:59:43 +00:00
2023-07-17 13:56:28 +02:00