Resolve conflicts
This commit is contained in:
parent
281b388e39
commit
bfc193d8cd
308 changed files with 3045 additions and 3200 deletions
|
|
@ -7,7 +7,7 @@
|
|||
<div>
|
||||
{{ text }}
|
||||
</div>
|
||||
<mk-time :time="post.created_at"/>
|
||||
<mk-time :time="post.createdAt"/>
|
||||
</a>
|
||||
</div>
|
||||
</template>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue