diff options
| author | lambda <pleromagit@rogerbraun.net> | 2017-11-08 11:03:51 +0000 |
|---|---|---|
| committer | lambda <pleromagit@rogerbraun.net> | 2017-11-08 11:03:51 +0000 |
| commit | 7d84147500cb364d9af01caf83d712a0d25eb1c7 (patch) | |
| tree | 4477d7d2a3c0955161df41106edb52127a10e5f6 /src/components/conversation/conversation.vue | |
| parent | 83297aba15e090251cf08c96aecb529ef6f9305c (diff) | |
| parent | 4d5782b51f14913df47f5c9f13ec9d045fc731cf (diff) | |
Merge branch 'fix/missing-localization-strings' into 'develop'
Fix #37: Missing localization strings
Closes #37
See merge request pleroma/pleroma-fe!133
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 e8d97f99..b430d875 100644 --- a/src/components/conversation/conversation.vue +++ b/src/components/conversation/conversation.vue @@ -1,7 +1,7 @@ <template> <div class="timeline panel panel-default base00-background"> <div class="panel-heading base01-background base04 base03-border conversation-heading"> - Conversation + {{ $t('timeline.conversation') }} <span v-if="collapsable" style="float:right;"> <small><a href="#" @click.prevent="$emit('toggleExpanded')">Collapse</a></small> </span> |