Commit 5328ddf7 authored by Eugen Rochko's avatar Eugen Rochko

Merge branch 'master' into 'master'

Add entity Conversation for new direct timeline

See merge request !8
parents f8c232fe fe35907b
Pipeline #404 passed with stages
in 20 seconds
...@@ -316,3 +316,12 @@ Please check `app/javascript/mastodon/selectors/index.js` and `app/lib/feed_mana ...@@ -316,3 +316,12 @@ Please check `app/javascript/mastodon/selectors/index.js` and `app/lib/feed_mana
| `day` | String (UNIX timestamp) |{{< no >}}|2.4.1| | `day` | String (UNIX timestamp) |{{< no >}}|2.4.1|
| `uses` | Number |{{< no >}}|2.4.1| | `uses` | Number |{{< no >}}|2.4.1|
| `accounts` | Number |{{< no >}}|2.4.1| | `accounts` | Number |{{< no >}}|2.4.1|
### Conversation
|Attribute|Type|Nullable|Added in|
|---------|-----------|:------:|:------:|
| `id` | String |{{< no >}}|2.6.0|
| `accounts` | Array of [Account](#account) |{{< no >}}|2.6.0|
| `last_status` | [Status](#status) |{{< yes >}}|2.6.0|
| `unread` | Boolean |{{< no >}}|2.6.0|
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment