summaryrefslogtreecommitdiff
path: root/src/server/web/app/mobile/views/components/post.sub.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/mobile/views/components/post.sub.vue
parentresolve conflict (diff)
downloadmisskey-bfc193d8cd9aecdb82d585e8b4e101deac60a5bb.tar.gz
misskey-bfc193d8cd9aecdb82d585e8b4e101deac60a5bb.tar.bz2
misskey-bfc193d8cd9aecdb82d585e8b4e101deac60a5bb.zip
Resolve conflicts
Diffstat (limited to 'src/server/web/app/mobile/views/components/post.sub.vue')
-rw-r--r--src/server/web/app/mobile/views/components/post.sub.vue4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/server/web/app/mobile/views/components/post.sub.vue b/src/server/web/app/mobile/views/components/post.sub.vue
index b6ee7c1e08..adf444a2d6 100644
--- a/src/server/web/app/mobile/views/components/post.sub.vue
+++ b/src/server/web/app/mobile/views/components/post.sub.vue
@@ -1,14 +1,14 @@
<template>
<div class="sub">
<router-link class="avatar-anchor" :to="`/@${acct}`">
- <img class="avatar" :src="`${post.user.avatar_url}?thumbnail&size=96`" alt="avatar"/>
+ <img class="avatar" :src="`${post.user.avatarUrl}?thumbnail&size=96`" alt="avatar"/>
</router-link>
<div class="main">
<header>
<router-link class="name" :to="`/@${acct}`">{{ post.user.name }}</router-link>
<span class="username">@{{ acct }}</span>
<router-link class="created-at" :to="`/@${acct}/${post.id}`">
- <mk-time :time="post.created_at"/>
+ <mk-time :time="post.createdAt"/>
</router-link>
</header>
<div class="body">