Resolve conflicts

This commit is contained in:
syuilo 2018-03-29 14:48:47 +09:00
parent 281b388e39
commit bfc193d8cd
308 changed files with 3045 additions and 3200 deletions

View file

@ -7,7 +7,7 @@
<div>
{{ text }}
</div>
<mk-time :time="post.created_at"/>
<mk-time :time="post.createdAt"/>
</a>
</div>
</template>