Commit 920ecccc authored by Eugen Rochko's avatar Eugen Rochko

Merge branch 'patch-1' into 'master'

Conversation is not a sub-entity of Tag.

See merge request !36
parents 3411eb94 386ccc73
Pipeline #719 passed with stages
in 22 seconds
...@@ -369,7 +369,7 @@ Please check `app/javascript/mastodon/selectors/index.js` and `app/lib/feed_mana ...@@ -369,7 +369,7 @@ Please check `app/javascript/mastodon/selectors/index.js` and `app/lib/feed_mana
| `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 ## Conversation
|Attribute|Type|Nullable|Added in| |Attribute|Type|Nullable|Added in|
|---------|-----------|:------:|:------:| |---------|-----------|:------:|:------:|
......
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