diff options
| author | lambda <pleromagit@rogerbraun.net> | 2018-06-08 13:30:49 +0000 |
|---|---|---|
| committer | lambda <pleromagit@rogerbraun.net> | 2018-06-08 13:30:49 +0000 |
| commit | af47d51cd14503495c1ee7398ba733ad4c5ed4a4 (patch) | |
| tree | bf2b0df49756e72800a0f34bd5c26d4fb9beabeb /src/components/conversation/conversation.vue | |
| parent | 9b86fc4dcd05a8f63ff564e117f06caf8046be78 (diff) | |
| parent | e2c5e4eb46143b52ccff21ca0914c5f1b79376fa (diff) | |
Merge branch 'develop' into 'patch-1'
# Conflicts:
# src/i18n/messages.js
Diffstat (limited to 'src/components/conversation/conversation.vue')
| -rw-r--r-- | src/components/conversation/conversation.vue | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/components/conversation/conversation.vue b/src/components/conversation/conversation.vue index 308e5e7d..bfcd3fe7 100644 --- a/src/components/conversation/conversation.vue +++ b/src/components/conversation/conversation.vue @@ -3,7 +3,7 @@ <div class="panel-heading conversation-heading"> {{ $t('timeline.conversation') }} <span v-if="collapsable" style="float:right;"> - <small><a href="#" @click.prevent="$emit('toggleExpanded')">Collapse</a></small> + <small><a href="#" @click.prevent="$emit('toggleExpanded')">{{ $t('timeline.collapse') }}</a></small> </span> </div> <div class="panel-body"> |