1
0
Fork 0
mirror of https://github.com/mealie-recipes/mealie.git synced 2025-07-24 07:39:41 +02:00

Merge branch 'mealie-recipes:mealie-next' into manage-data-improve-delete-prompt

This commit is contained in:
Kuchenpirat 2023-11-21 15:34:21 +01:00 committed by GitHub
commit e98eee56be
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
11 changed files with 605 additions and 24 deletions

View file

@ -183,7 +183,7 @@
<BaseButton create @click="createDialog = true" />
<BaseButton @click="mergeDialog = true">
<template #icon> {{ $globals.icons.units }} </template>
<template #icon> {{ $globals.icons.externalLink }} </template>
{{ $t('data-pages.combine') }}
</BaseButton>
</template>