Merge branch 'patch-1' into 'master'

languages in /api/v1/instance should allow all parts of ISO 639

See merge request mastodon/docs!6
This commit is contained in:
Eugen Rochko 2019-01-30 22:40:41 +01:00
commit 134124c290
1 changed files with 1 additions and 1 deletions

View File

@ -187,7 +187,7 @@ Please check `app/javascript/mastodon/selectors/index.js` and `app/lib/feed_mana
| `thumbnail` | String (URL) |{{< yes >}}|1.6.1|
| `urls` | [Hash](#urls) |{{< no >}}|1.4.2|
| `stats` | [Hash](#stats) |{{< no >}}|1.6.0|
| `languages` | Array of String (ISO6391) |{{< no >}}|2.3.0|
| `languages` | Array of String (ISO 639, Part 1-5) |{{< no >}}|2.3.0|
| `contact_account` | [Account](#account) |{{< yes >}}|2.3.0|
### URLs