fix list after conflict

This commit is contained in:
Henry Jameson 2020-03-25 18:38:06 +02:00
parent f881d6d2b5
commit 3527c14625

View file

@ -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>