therwi/sunkkoma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' into 'feature/accountHighlight'

Browse source 
# Conflicts:
#   src/components/user_card_content/user_card_content.vue
This commit is contained in:
Henry 2018-08-12 12:05:08 +00:00
commit 27adde9887
12 changed files with 55 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/components/status/status.js
View file

@ -60,6 +60,7 @@ const Status = {
},
retweet () { return !!this.statusoid.retweeted_status },
retweeter () { return this.statusoid.user.name },
retweeterHtml () { return this.statusoid.user.name_html },
status () {
if (this.retweet) {
return this.statusoid.retweeted_status