From d3e1472aad57627498e8e4998f036049376f0f21 Mon Sep 17 00:00:00 2001
From: Phie <phie@phie.ovh>
Date: Fri, 21 May 2021 21:32:06 +0200
Subject: changelog and update to stable branch script to create new branch on
 CarnetElectron too

---
 CHANGELOG.md             | 14 +++++++++++++-
 templates/CarnetElectron |  2 +-
 to_stable_branch.sh      |  5 +++++
 3 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c611a18..10e18eb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,16 @@
-# Versio 0.23.7
+# Version 0.24.0
+
+Option to create note as folder (beta for dev)
+
+Fix:
+Nextcloud 21
+Export all notes (by Yamanq)
+Metadata (by hobbsecky)
+Search in folder notes
+
+
+
+# Version 0.23.7
 
 Loading view when extracting media
 Fix todolist when preloading editor
diff --git a/templates/CarnetElectron b/templates/CarnetElectron
index fa2279f..7800759 160000
--- a/templates/CarnetElectron
+++ b/templates/CarnetElectron
@@ -1 +1 @@
-Subproject commit fa2279f18cef91678142b0391007803d15097b59
+Subproject commit 78007590a7fca55fd381f91af94f52a4dc619a5c
diff --git a/to_stable_branch.sh b/to_stable_branch.sh
index 974d855..d685d73 100644
--- a/to_stable_branch.sh
+++ b/to_stable_branch.sh
@@ -12,3 +12,8 @@ git checkout -b stable-$version
 git push origin stable-$version
 git push framagit stable-$version
 git checkout master
+cd templates/CarnetElectron
+git checkout -b nextcloud-stable-$version
+git push origin nextcloud-stable-$version
+git push framagit nextcloud-stable-$version
+git checkout main
-- 
cgit v1.2.3