diff options
| author | HJ <30-hj@users.noreply.git.pleroma.social> | 2019-05-15 18:26:09 +0000 |
|---|---|---|
| committer | HJ <30-hj@users.noreply.git.pleroma.social> | 2019-05-15 18:26:09 +0000 |
| commit | fedcc716762339b72f6a99722f2c54a300fdff4f (patch) | |
| tree | 15c89025e846ba322003bc9cb0965d3ed1fac00a /src/components/conversation/conversation.js | |
| parent | 9eac355851b40aa5df9e6b23eca8c0ff1698e670 (diff) | |
| parent | 2ce01863273fdefad7bca945f5d58d50a0e8d77b (diff) | |
Merge branch '468-pin-status' into 'develop'
Add ability to pin posts
Closes #468
See merge request pleroma/pleroma-fe!770
Diffstat (limited to 'src/components/conversation/conversation.js')
| -rw-r--r-- | src/components/conversation/conversation.js | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/components/conversation/conversation.js b/src/components/conversation/conversation.js index ffeb7244..b3074590 100644 --- a/src/components/conversation/conversation.js +++ b/src/components/conversation/conversation.js @@ -41,7 +41,8 @@ const conversation = { props: [ 'statusoid', 'collapsable', - 'isPage' + 'isPage', + 'showPinned' ], created () { if (this.isPage) { |