Merge branch 'dev' into 9.4RC

2 files changed, 5 insertions, 1 deletions

diff --git a/CHANGELOG b/CHANGELOG
index 4a357531a..cababe3b3 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -22,7 +22,11 @@ Hubzilla 9.4 (2024-??-??)
 	- Streamline URLs used in attachments and body to ease deduplication
 	- Code cleanup and remove some unused/deprecated functions
 
+	Bugfixes
+	- Fix notes app not displaying anything - issue #1865
+
 	Addons
+	- Wiki: fix markdown content not unescaped when undoing history - issue #1864
 	- Gallery: update to photoswipe 5.4.4
 	- Openstreemap: streamline location rendering
 	- Socialauth: update version and contact details
diff --git a/boot.php b/boot.php
index d50919e16..66dba84c3 100644
--- a/boot.php
+++ b/boot.php
@@ -66,7 +66,7 @@ require_once('include/security.php');
 
 
 define('PLATFORM_NAME', 'hubzilla');
-define('STD_VERSION', '9.4RC');
+define('STD_VERSION', '9.5');
 define('ZOT_REVISION', '6.0');
 
 define('DB_UPDATE_VERSION', 1263);