diff options
| author | Roger Braun <roger@rogerbraun.net> | 2018-05-20 13:16:49 +0200 |
|---|---|---|
| committer | Roger Braun <roger@rogerbraun.net> | 2018-05-20 13:16:49 +0200 |
| commit | 959b2d9d664dbee5fe5c13f29b405bf8904a5437 (patch) | |
| tree | c5284bd784c4714abc99f87005afba0531084fa2 /src/components/conversation/conversation.vue | |
| parent | 327b6fb5dcbabf5de61e1ce0fa6c65329a8ec45b (diff) | |
| parent | 28c60832c79086f3c230627139396191bea7e9e4 (diff) | |
Merge branch 'develop' into Syldexia/pleroma-fe-feature/account-deletion
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"> |