aboutsummaryrefslogtreecommitdiff
path: root/src/components/timeline/timeline.js
diff options
context:
space:
mode:
authorwakarimasen <wakarimasen@airmail.cc>2017-03-10 12:29:21 +0100
committerwakarimasen <wakarimasen@airmail.cc>2017-03-10 12:38:47 +0100
commit896de016adbabd142c09476a323f4e02cefa88c9 (patch)
treea2cec29e4afab22aeec5e7ed41b25a19263402d3 /src/components/timeline/timeline.js
parent2f52669380703030aa8e197deb05240c5f3bf979 (diff)
parentbfbbb527677ba4648b1be376bb02b0bd3c3e29ba (diff)
Merge branch 'develop' of https://gitgud.io/lambadalambda/pleroma-fe into wakarimasen/pleroma-fe-develop
Diffstat (limited to 'src/components/timeline/timeline.js')
-rw-r--r--src/components/timeline/timeline.js3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/components/timeline/timeline.js b/src/components/timeline/timeline.js
index b4e80fe1..d5a9adcc 100644
--- a/src/components/timeline/timeline.js
+++ b/src/components/timeline/timeline.js
@@ -8,6 +8,9 @@ const Timeline = {
'timelineName',
'title'
],
+ computed: {
+ timelineError () { return this.$store.state.statuses.error }
+ },
components: {
Status,
StatusOrConversation