Merge branch 'dev' into dev_no_template

Desktop: Add a banner asking users to install templates plugin (#5164 )
Desktop: Remove templates feature (#5115 )
2026-04-02 10:51:52 +02:00 · 2021-08-06 10:49:28 +01:00 · 2021-07-09 10:46:05 +01:00 · 2021-06-25 17:49:36 +01:00
2 changed files with 2 additions and 2 deletions
--- a/packages/app-desktop/package-lock.json
+++ b/packages/app-desktop/package-lock.json
@@ -1,6 +1,6 @@
 {
  "name": "@joplin/app-desktop",
-  "version": "2.2.5",
+  "version": "2.2.2",
  "lockfileVersion": 1,
  "requires": true,
  "dependencies": {
--- a/packages/app-desktop/package.json
+++ b/packages/app-desktop/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@joplin/app-desktop",
-  "version": "2.2.5",
+  "version": "2.2.2",
  "description": "Joplin for Desktop",
  "main": "main.js",
  "private": true,
Author	SHA1	Message	Date
Laurent Cozic	5eae378809	Merge branch 'dev' into dev_no_template	2021-08-06 10:49:28 +01:00
Nishant Mittal	13c6206624	Desktop: Add a banner asking users to install templates plugin (#5164 )	2021-07-09 10:46:05 +01:00
Nishant Mittal	d13d5b4cc3	Desktop: Remove templates feature (#5115 )	2021-06-25 17:49:36 +01:00