Merge branch 'master' into typescript

This commit is contained in:
Ulf Gebhardt 2023-06-02 10:16:01 +02:00 committed by GitHub
commit d2a44c8753
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions

View File

@ -9,7 +9,7 @@
<p class="description">{{ $t(`notifications.reason.${notification.reason}`) }}</p>
<nuxt-link
class="link"
:to="{ name: isGroup ? 'group-id-slug' : 'post-id-slug', params, hashParam }"
:to="{ name: isGroup ? 'group-id-slug' : 'post-id-slug', params, ...hashParam }"
@click.native="$emit('read')"
>
<base-card wideContent>

View File

@ -78,7 +78,7 @@ export default {
Group: [],
groupFilter: { isMember: true },
tabActive: 'myGroups',
pageSize: 5,
pageSize: 6,
activePage: 0,
myGroupsCount: 0,
allGroupsCount: 0,