diff options
| author | Roger Braun <roger@rogerbraun.net> | 2017-03-09 10:33:21 +0100 |
|---|---|---|
| committer | Roger Braun <roger@rogerbraun.net> | 2017-03-09 10:33:21 +0100 |
| commit | 0eeccb87cef4d137710e3c7fd215b94e45aff3d1 (patch) | |
| tree | 584085071af589e58f79ffb67051c49b6bd883bb /src/components/timeline/timeline.js | |
| parent | 290180a987ecb4949fc877c512f3cff120bcbc70 (diff) | |
| parent | 64d71b75cfed41d82a99e3e478fc75d5f81f84bd (diff) | |
Merge branch 'develop' into feature/hash-routed
Diffstat (limited to 'src/components/timeline/timeline.js')
| -rw-r--r-- | src/components/timeline/timeline.js | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/components/timeline/timeline.js b/src/components/timeline/timeline.js index addd0255..b4e80fe1 100644 --- a/src/components/timeline/timeline.js +++ b/src/components/timeline/timeline.js @@ -5,7 +5,8 @@ import StatusOrConversation from '../status_or_conversation/status_or_conversati const Timeline = { props: [ 'timeline', - 'timelineName' + 'timelineName', + 'title' ], components: { Status, |