aboutsummaryrefslogtreecommitdiff
path: root/src/components/timeline/timeline.js
diff options
context:
space:
mode:
authorShpuld Shpludson <shp@cock.li>2019-02-21 17:24:39 +0000
committerShpuld Shpludson <shp@cock.li>2019-02-21 17:24:39 +0000
commitc3fa2c90e2e09619ddc72d2c19ea223d49c9d349 (patch)
tree8887a68b286fdb5c9c22d44a215074cf1df44c7d /src/components/timeline/timeline.js
parent254b0afab747ad6e67b675bdf233b9dfcbc59f0b (diff)
parente20a7be3aa4973400cd670347ff038a78eb12e4e (diff)
Merge branch 'issue-376-no-statuses' into 'develop'
#376: update status timeline when it's empty Closes #376 See merge request pleroma/pleroma-fe!601
Diffstat (limited to 'src/components/timeline/timeline.js')
-rw-r--r--src/components/timeline/timeline.js3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/components/timeline/timeline.js b/src/components/timeline/timeline.js
index 85e0a055..40226674 100644
--- a/src/components/timeline/timeline.js
+++ b/src/components/timeline/timeline.js
@@ -11,7 +11,8 @@ const Timeline = {
'title',
'userId',
'tag',
- 'embedded'
+ 'embedded',
+ 'count'
],
data () {
return {