summaryrefslogtreecommitdiff
path: root/src/server/web/app/desktop/views/components/sub-post-content.vue
diff options
context:
space:
mode:
authorsyuilo <syuilotan@yahoo.co.jp>2018-03-29 14:48:47 +0900
committersyuilo <syuilotan@yahoo.co.jp>2018-03-29 14:48:47 +0900
commitbfc193d8cd9aecdb82d585e8b4e101deac60a5bb (patch)
tree8b4dac3a56cf703650c8207f9279028a8560a96b /src/server/web/app/desktop/views/components/sub-post-content.vue
parentresolve conflict (diff)
downloadmisskey-bfc193d8cd9aecdb82d585e8b4e101deac60a5bb.tar.gz
misskey-bfc193d8cd9aecdb82d585e8b4e101deac60a5bb.tar.bz2
misskey-bfc193d8cd9aecdb82d585e8b4e101deac60a5bb.zip
Resolve conflicts
Diffstat (limited to 'src/server/web/app/desktop/views/components/sub-post-content.vue')
-rw-r--r--src/server/web/app/desktop/views/components/sub-post-content.vue4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/server/web/app/desktop/views/components/sub-post-content.vue b/src/server/web/app/desktop/views/components/sub-post-content.vue
index 8c8f42c801..f13822331b 100644
--- a/src/server/web/app/desktop/views/components/sub-post-content.vue
+++ b/src/server/web/app/desktop/views/components/sub-post-content.vue
@@ -1,9 +1,9 @@
<template>
<div class="mk-sub-post-content">
<div class="body">
- <a class="reply" v-if="post.reply_id">%fa:reply%</a>
+ <a class="reply" v-if="post.replyId">%fa:reply%</a>
<mk-post-html :ast="post.ast" :i="os.i"/>
- <a class="rp" v-if="post.repost_id" :href="`/post:${post.repost_id}`">RP: ...</a>
+ <a class="rp" v-if="post.repostId" :href="`/post:${post.repostId}`">RP: ...</a>
<mk-url-preview v-for="url in urls" :url="url" :key="url"/>
</div>
<details v-if="post.media">