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-18 07:51:31 +00:00
2024-12-18 07:51:31 +00:00
2024-12-18 07:51:31 +00:00
2025-01-02 09:02:47 +00:00
2025-01-06 08:13:39 +00:00
2025-01-02 09:02:47 +00:00
2025-01-06 08:13:39 +00:00
2024-12-17 09:33:42 +00:00
2024-12-18 07:51:31 +00:00
2024-12-02 08:27:19 +00:00
2025-01-06 08:13:39 +00:00
2024-12-18 07:51:31 +00:00
2024-12-17 09:33:42 +00:00
2025-01-13 09:13:47 +00:00
2025-01-08 09:01:28 +00:00
2025-01-07 07:50:27 +00:00
2025-01-06 08:13:39 +00:00
2025-01-06 08:13:39 +00:00
2024-12-18 07:51:31 +00:00
2025-01-03 09:24:50 +00:00
2025-01-06 08:13:39 +00:00
2025-01-06 08:13:39 +00:00
2025-01-06 08:13:39 +00:00
2025-01-06 08:13:39 +00:00
2025-01-03 07:53:00 +00:00
2024-12-18 07:51:31 +00:00
2025-01-02 09:02:47 +00:00
2025-01-06 08:13:39 +00:00
2025-01-06 08:13:39 +00:00
2025-01-07 07:50:27 +00:00
2025-01-06 08:13:39 +00:00
2025-01-06 08:13:39 +00:00
2024-12-18 07:51:31 +00:00
2025-01-13 09:13:47 +00:00
2024-12-18 07:51:31 +00:00
2025-01-06 08:13:39 +00:00
2023-10-31 16:05:44 +00:00
2025-01-06 08:13:39 +00:00
2024-12-18 07:51:31 +00:00
2024-12-18 07:51:31 +00:00
2025-01-10 09:00:41 +00:00
2024-12-17 09:33:42 +00:00
2025-01-13 09:13:47 +00:00
2024-12-18 07:51:31 +00:00
2024-12-18 07:51:31 +00:00
2024-12-02 08:27:19 +00:00
2023-06-02 15:00:27 +02:00
2024-09-11 13:59:46 +00:00
2024-12-18 07:51:31 +00:00
2025-01-06 08:13:39 +00:00
2025-01-13 09:13:47 +00:00
2025-01-13 09:13:47 +00:00
2024-12-17 09:33:42 +00:00
2024-12-18 07:51:31 +00:00
2024-12-17 09:33:42 +00:00
2024-12-02 08:27:19 +00:00
2025-01-07 07:50:27 +00:00
2024-12-18 07:51:31 +00:00
2024-12-17 09:33:42 +00:00
2025-01-06 08:13:39 +00:00
2024-12-18 07:51:31 +00:00
2023-07-13 14:22:20 +02:00
2025-01-06 08:13:39 +00:00
2025-01-14 08:44:58 +00:00
2024-12-17 09:33:42 +00:00
2024-12-18 07:51:31 +00:00
2024-12-18 07:51:31 +00:00
2024-12-18 07:51:31 +00:00
2024-12-18 07:51:31 +00:00
2025-01-14 08:44:58 +00:00
2025-01-13 09:13:47 +00:00
2025-01-06 08:13:39 +00:00
2025-01-09 08:21:47 +00:00
2024-12-18 07:51:31 +00:00
2024-12-17 09:33:42 +00:00
2024-12-18 07:51:31 +00:00
2025-01-13 09:13:47 +00:00
2025-01-13 09:13:47 +00:00
2025-01-13 09:13:47 +00:00
2025-01-03 07:53:00 +00:00
2025-01-02 09:02:47 +00:00
2024-12-02 08:27:19 +00:00
2024-12-18 07:51:31 +00:00
2024-12-18 07:51:31 +00:00
2024-12-18 07:51:31 +00:00
2024-12-18 07:51:31 +00:00
2025-01-13 09:13:47 +00:00
2024-12-18 07:51:31 +00:00
2025-01-06 08:13:39 +00:00
2024-12-18 07:51:31 +00:00
2024-12-18 07:51:31 +00:00
2025-01-09 08:21:47 +00:00
2024-12-02 08:27:19 +00:00
2024-12-17 09:33:42 +00:00
2024-12-02 08:27:19 +00:00
2024-12-17 09:33:42 +00:00
2025-01-06 08:13:39 +00:00
2023-12-05 16:07:53 +00:00
2024-12-18 07:51:31 +00:00
2025-01-06 08:13:39 +00:00
2024-12-18 07:51:31 +00:00
2024-12-02 08:27:19 +00:00
2025-01-06 08:13:39 +00:00
2024-12-02 08:27:19 +00:00
2024-12-18 07:51:31 +00:00
2025-01-13 09:13:47 +00:00
2024-12-17 09:33:42 +00:00
2025-01-06 08:13:39 +00:00
2024-12-18 07:51:31 +00:00
2025-01-06 08:13:39 +00:00