hj/pleroma-fe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix list after conflict

Browse source
This commit is contained in:
Henry Jameson 2020-03-25 18:38:06 +02:00
parent f881d6d2b5
commit 3527c14625
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/components/settings/settings.vue
View file

@ -96,6 +96,8 @@
<Checkbox v-model="virtualScrolling"> <Checkbox v-model="virtualScrolling">
{{ $t('settings.virtual_scrolling') }} {{ $t('settings.virtual_scrolling') }}
</Checkbox> </Checkbox>
</li>
<li>
<Checkbox v-model="emojiReactionsOnTimeline"> <Checkbox v-model="emojiReactionsOnTimeline">
{{ $t('settings.emoji_reactions_on_timeline') }} {{ $t('settings.emoji_reactions_on_timeline') }}
</Checkbox> </Checkbox>