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/settings_modal/tabs/general_tab.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/settings_modal/tabs/general_tab.vue')
| -rw-r--r-- | src/components/settings_modal/tabs/general_tab.vue | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/components/settings_modal/tabs/general_tab.vue b/src/components/settings_modal/tabs/general_tab.vue index 7f06d0bd..13482de7 100644 --- a/src/components/settings_modal/tabs/general_tab.vue +++ b/src/components/settings_modal/tabs/general_tab.vue @@ -58,6 +58,11 @@ {{ $t('settings.emoji_reactions_on_timeline') }} </Checkbox> </li> + <li> + <Checkbox v-model="virtualScrolling"> + {{ $t('settings.virtual_scrolling') }} + </Checkbox> + </li> </ul> </div> |