Mirrors/mealie
1
0
Fork 0
mirror of https://github.com/mealie-recipes/mealie.git synced 2025-11-26 21:54:24 -05:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Kuchenpirat
2023-11-21 15:34:21 +01:00
committed by GitHub
parent 098c94e253 63ac21bce2
commit e98eee56be
11 changed files with 605 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
frontend/pages/group/data/foods.vue
View File

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