update with develop

This commit is contained in:
Shpuld Shpuldson 2020-02-17 15:53:53 +02:00
commit db9471cd3e
45 changed files with 1040 additions and 89 deletions

View file

@ -97,6 +97,11 @@
{{ $t('settings.virtual_scrolling') }}
</Checkbox>
</li>
<li>
<Checkbox v-model="emojiReactionsOnTimeline">
{{ $t('settings.emoji_reactions_on_timeline') }}
</Checkbox>
</li>
</ul>
</div>
@ -333,6 +338,11 @@
{{ $t('settings.notification_visibility_moves') }}
</Checkbox>
</li>
<li>
<Checkbox v-model="notificationVisibility.emojiReactions">
{{ $t('settings.notification_visibility_emoji_reactions') }}
</Checkbox>
</li>
</ul>
</div>
<div>