1
0
mirror of https://github.com/laurent22/joplin.git synced 2024-12-21 09:38:01 +02:00

Merge release-2.9

This commit is contained in:
Laurent Cozic 2022-11-14 17:33:21 +00:00
parent 5d49fcfe4e
commit 7b94901129
3 changed files with 7 additions and 1 deletions

View File

@ -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.d.ts
packages/app-desktop/gui/NoteEditor/utils/useDropHandler.js packages/app-desktop/gui/NoteEditor/utils/useDropHandler.js
packages/app-desktop/gui/NoteEditor/utils/useDropHandler.js.map 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.d.ts
packages/app-desktop/gui/NoteEditor/utils/useFolder.js packages/app-desktop/gui/NoteEditor/utils/useFolder.js
packages/app-desktop/gui/NoteEditor/utils/useFolder.js.map packages/app-desktop/gui/NoteEditor/utils/useFolder.js.map

3
.gitignore vendored
View File

@ -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.d.ts
packages/app-desktop/gui/NoteEditor/utils/useDropHandler.js packages/app-desktop/gui/NoteEditor/utils/useDropHandler.js
packages/app-desktop/gui/NoteEditor/utils/useDropHandler.js.map 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.d.ts
packages/app-desktop/gui/NoteEditor/utils/useFolder.js packages/app-desktop/gui/NoteEditor/utils/useFolder.js
packages/app-desktop/gui/NoteEditor/utils/useFolder.js.map packages/app-desktop/gui/NoteEditor/utils/useFolder.js.map

View File

@ -1,6 +1,6 @@
{ {
"name": "@joplin/app-desktop", "name": "@joplin/app-desktop",
"version": "2.9.12", "version": "2.9.15",
"description": "Joplin for Desktop", "description": "Joplin for Desktop",
"main": "main.js", "main": "main.js",
"private": true, "private": true,