Claire
155dc4bc4b
Merge commit '34cd7d6585992c03298c175ab5d22ad059b58cdb' into glitch-soc/merge-upstream
...
Conflicts:
- `CONTRIBUTING.md`:
Upstream changed the file, while we had a different one.
Updated the common parts.
- `README.md`:
Upstream changed the file, while we had a different one.
Updated the common parts.
- `app/helpers/application_helper.rb`:
Upstream added helpers where glitch-soc had extra ones.
Added upstream's new helpers.
- `app/models/form/admin_settings.rb`:
Upstream added some custom handling of one setting, while
glitch-soc had additional code.
Ported upstream's code.
- `lib/mastodon/version.rb`:
Upstream moved some things to `config/mastodon.yml`.
Did the same.
- `spec/requests/api/v1/accounts/credentials_spec.rb`:
I don't know honestly.
2025-01-10 20:41:36 +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-06 08:13:39 +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
2024-12-18 07:51:31 +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-09 08:21: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-03 07:53:00 +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
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-07 07:50:27 +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-02 09:02:47 +00:00
2025-01-02 09:02: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-10 09:00:41 +00:00
2025-01-10 09:00:41 +00:00
2025-01-10 09:00:41 +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-06 08:13:39 +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-06 08:13:39 +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