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