diff options
| author | Shpuld Shpludson <shp@cock.li> | 2020-10-01 12:54:54 +0000 |
|---|---|---|
| committer | Shpuld Shpludson <shp@cock.li> | 2020-10-01 12:54:54 +0000 |
| commit | 8a34ff2957e28f7531c62c793ea4f24558e08ced (patch) | |
| tree | a631749e1fe647085d2ea328b5840b56b344b04e /src/components/poll/poll.vue | |
| parent | fa9176651952468ee996abe0e67d62d9a72d5a69 (diff) | |
| parent | 68c2a5b18f887f3db2f5685953bc5175aaaabbd3 (diff) | |
Merge branch 'develop' into 'feat/masto-ws-deletes'
# Conflicts:
# CHANGELOG.md
# src/components/status/status.js
# src/components/status/status.scss
Diffstat (limited to 'src/components/poll/poll.vue')
| -rw-r--r-- | src/components/poll/poll.vue | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/components/poll/poll.vue b/src/components/poll/poll.vue index 1858f3e1..5f54b416 100644 --- a/src/components/poll/poll.vue +++ b/src/components/poll/poll.vue @@ -17,6 +17,7 @@ <span class="result-percentage"> {{ percentageForOption(option.votes_count) }}% </span> + <!-- eslint-disable-next-line vue/no-v-html --> <span v-html="option.title_html" /> </div> <div |