diff options
| author | Shpuld Shpludson <shp@cock.li> | 2019-08-17 08:12:21 +0000 |
|---|---|---|
| committer | Shpuld Shpludson <shp@cock.li> | 2019-08-17 08:12:21 +0000 |
| commit | e5fe4f420ca66f3916bc986ee9d65ce6a9bf75aa (patch) | |
| tree | 5de744e4a1437d51d6849450a8456ba6e76fac88 /src/components/interactions/interactions.vue | |
| parent | 9f6be4fe654a26d57c67cbe0f42cd3bbb1b37e92 (diff) | |
| parent | 7dfcabb5433a5eb805bbda6ef87390c6ed2d5372 (diff) | |
Merge branch '564' into 'develop'
Restore scroll position for user profile when navigate back and forward
Closes #636 and #564
See merge request pleroma/pleroma-fe!914
Diffstat (limited to 'src/components/interactions/interactions.vue')
| -rw-r--r-- | src/components/interactions/interactions.vue | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/components/interactions/interactions.vue b/src/components/interactions/interactions.vue index d71c99d5..08cee343 100644 --- a/src/components/interactions/interactions.vue +++ b/src/components/interactions/interactions.vue @@ -10,18 +10,15 @@ :on-switch="onModeSwitch" > <span - data-tab-dummy - data-filter="mentions" + key="mentions" :label="$t('nav.mentions')" /> <span - data-tab-dummy - data-filter="likes+repeats" + key="likes+repeats" :label="$t('interactions.favs_repeats')" /> <span - data-tab-dummy - data-filter="follows" + key="follows" :label="$t('interactions.follows')" /> </tab-switcher> |