From 7b9490112925e49977e56a6c463f711198409e31 Mon Sep 17 00:00:00 2001 From: Laurent Cozic Date: Mon, 14 Nov 2022 17:33:21 +0000 Subject: [PATCH] Merge release-2.9 --- .eslintignore | 3 +++ .gitignore | 3 +++ packages/app-desktop/package.json | 2 +- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/.eslintignore b/.eslintignore index 6adde250f..38c7d395e 100644 --- a/.eslintignore +++ b/.eslintignore @@ -555,6 +555,9 @@ packages/app-desktop/gui/NoteEditor/utils/types.js.map packages/app-desktop/gui/NoteEditor/utils/useDropHandler.d.ts packages/app-desktop/gui/NoteEditor/utils/useDropHandler.js packages/app-desktop/gui/NoteEditor/utils/useDropHandler.js.map +packages/app-desktop/gui/NoteEditor/utils/useEffectiveNoteId.d.ts +packages/app-desktop/gui/NoteEditor/utils/useEffectiveNoteId.js +packages/app-desktop/gui/NoteEditor/utils/useEffectiveNoteId.js.map packages/app-desktop/gui/NoteEditor/utils/useFolder.d.ts packages/app-desktop/gui/NoteEditor/utils/useFolder.js packages/app-desktop/gui/NoteEditor/utils/useFolder.js.map diff --git a/.gitignore b/.gitignore index b52d461f9..a066758f5 100644 --- a/.gitignore +++ b/.gitignore @@ -543,6 +543,9 @@ packages/app-desktop/gui/NoteEditor/utils/types.js.map packages/app-desktop/gui/NoteEditor/utils/useDropHandler.d.ts packages/app-desktop/gui/NoteEditor/utils/useDropHandler.js packages/app-desktop/gui/NoteEditor/utils/useDropHandler.js.map +packages/app-desktop/gui/NoteEditor/utils/useEffectiveNoteId.d.ts +packages/app-desktop/gui/NoteEditor/utils/useEffectiveNoteId.js +packages/app-desktop/gui/NoteEditor/utils/useEffectiveNoteId.js.map packages/app-desktop/gui/NoteEditor/utils/useFolder.d.ts packages/app-desktop/gui/NoteEditor/utils/useFolder.js packages/app-desktop/gui/NoteEditor/utils/useFolder.js.map diff --git a/packages/app-desktop/package.json b/packages/app-desktop/package.json index 8380fec9d..a58e37a1a 100644 --- a/packages/app-desktop/package.json +++ b/packages/app-desktop/package.json @@ -1,6 +1,6 @@ { "name": "@joplin/app-desktop", - "version": "2.9.12", + "version": "2.9.15", "description": "Joplin for Desktop", "main": "main.js", "private": true,