fix list after conflict
This commit is contained in:
parent
f881d6d2b5
commit
3527c14625
1 changed files with 2 additions and 0 deletions
|
@ -96,6 +96,8 @@
|
|||
<Checkbox v-model="virtualScrolling">
|
||||
{{ $t('settings.virtual_scrolling') }}
|
||||
</Checkbox>
|
||||
</li>
|
||||
<li>
|
||||
<Checkbox v-model="emojiReactionsOnTimeline">
|
||||
{{ $t('settings.emoji_reactions_on_timeline') }}
|
||||
</Checkbox>
|
||||
|
|
Loading…
Add table
Reference in a new issue