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:
commit
e98eee56be
11 changed files with 605 additions and 24 deletions
|
@ -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>
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue