Merge branch 'mastodon:main' into main

This commit is contained in:
John Haugabook 2024-03-14 16:22:19 -04:00 committed by GitHub
commit 0f3d9f284d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 2 additions and 2 deletions

View File

@ -484,7 +484,7 @@ aliases: [
#### `contact[account]` {#contact-account}
**Description:** An account that can be contacted natively over the network regarding inquiries or issues.\
**Type:** [Account]({{< relref "entities/Account" >}})\
**Type:** {{<nullable>}} [Account]({{< relref "entities/Account" >}}) or null\
**Version history:**\
4.0.0 - added

View File

@ -401,7 +401,7 @@ aliases: [
### `contact_account` {#contact_account}
**Description:** A user that can be contacted, as an alternative to `email`.\
**Type:** [Account]({{< relref "entities/Account" >}})\
**Type:** {{<nullable>}} [Account]({{< relref "entities/Account" >}}) or null\
**Version history:**\
2.3.0 - added