From da98c611e12680d1898add7b7aa32a352b7953fc Mon Sep 17 00:00:00 2001
From: the-djmaze <>
Date: Wed, 23 Nov 2022 12:57:44 +0100
Subject: [PATCH] v2.22.0

---
 .../files/usr/local/include/application.ini   |  2 +-
 CHANGELOG.md                                  | 22 +++++++++++++++++++
 integrations/cloudron/DESCRIPTION.md          |  2 +-
 integrations/cloudron/Dockerfile              |  2 +-
 .../nextcloud/snappymail/appinfo/info.xml     |  2 +-
 integrations/virtualmin/snappymail.pl         |  2 +-
 package.json                                  |  2 +-
 7 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/.docker/release/files/usr/local/include/application.ini b/.docker/release/files/usr/local/include/application.ini
index fc32c0018..0d04adea6 100644
--- a/.docker/release/files/usr/local/include/application.ini
+++ b/.docker/release/files/usr/local/include/application.ini
@@ -289,5 +289,5 @@ dev_email = ""
 dev_password = ""
 
 [version]
-current = "2.21.4"
+current = "2.22.0"
 saved = "Fri, 30 Sep 2022 12:34:56 +0000"
diff --git a/CHANGELOG.md b/CHANGELOG.md
index bfcbdc35c..c93ee467e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,25 @@
+## 2.22.0 – 2022-11-23
+
+### Added
+- AddressBookInterface::GetContactByEmail() to support sender image/avatar extension
+  [#115](https://github.com/the-djmaze/snappymail/pull/115)
+
+### Changed
+- All the attachment zone is not clickable, even if the cursor is a hand
+  [#691](https://github.com/the-djmaze/snappymail/pull/691)
+- Different approach for "update button duplicated in admin panel"
+  [#677](https://github.com/the-djmaze/snappymail/pull/677)
+- Better drag & drop solution for leftPanel
+
+### Fixed
+- The page does not change after batch deletion
+  [#684](https://github.com/the-djmaze/snappymail/pull/684)
+- Prevent domain uppercase issues found in
+  [#689](https://github.com/the-djmaze/snappymail/pull/689)
+- Login invalid response: VXNlcm5hbWU6CG
+  [#693](https://github.com/the-djmaze/snappymail/pull/693)
+
+
 ## 2.21.4 – 2022-11-22
 
 ### Added
diff --git a/integrations/cloudron/DESCRIPTION.md b/integrations/cloudron/DESCRIPTION.md
index 437a8e168..8d16ef18e 100644
--- a/integrations/cloudron/DESCRIPTION.md
+++ b/integrations/cloudron/DESCRIPTION.md
@@ -1,4 +1,4 @@
-This app packages SnappyMail <upstream>2.21.4</upstream>.
+This app packages SnappyMail <upstream>2.22.0</upstream>.
 
 SnappyMail is a simple, modern, lightweight & fast web-based email client.
 
diff --git a/integrations/cloudron/Dockerfile b/integrations/cloudron/Dockerfile
index bddbb47a3..66102f0c1 100644
--- a/integrations/cloudron/Dockerfile
+++ b/integrations/cloudron/Dockerfile
@@ -4,7 +4,7 @@ RUN mkdir -p /app/code
 WORKDIR /app/code
 
 # If you change the extraction below, be sure to test on scaleway
-VERSION=2.21.4
+VERSION=2.22.0
 RUN wget https://github.com/the-djmaze/snappymail/releases/download/v${VERSION}/snappymail-${VERSION}.zip -O /tmp/snappymail.zip && \
     unzip /tmp/snappymail.zip -d /app/code && \
     rm /tmp/snappymail.zip && \
diff --git a/integrations/nextcloud/snappymail/appinfo/info.xml b/integrations/nextcloud/snappymail/appinfo/info.xml
index 15bb98944..326f799ef 100644
--- a/integrations/nextcloud/snappymail/appinfo/info.xml
+++ b/integrations/nextcloud/snappymail/appinfo/info.xml
@@ -3,7 +3,7 @@
 	<id>snappymail</id>
 	<name>SnappyMail</name>
 	<summary>SnappyMail Webmail</summary>
-	<version>2.21.4</version>
+	<version>2.22.0</version>
 	<licence>agpl</licence>
 	<author>SnappyMail, RainLoop Team, Nextgen-Networks, Tab Fitts, Nathan Kinkade, Pierre-Alain Bandinelli</author>
 	<description><![CDATA[**Simple, modern, lightweight & fast web-based email client.**
diff --git a/integrations/virtualmin/snappymail.pl b/integrations/virtualmin/snappymail.pl
index 304768282..a61566018 100644
--- a/integrations/virtualmin/snappymail.pl
+++ b/integrations/virtualmin/snappymail.pl
@@ -20,7 +20,7 @@ return "SnappyMail Webmail is a browser-based multilingual IMAP client with an a
 # script_snappymail_versions()
 sub script_snappymail_versions
 {
-return ( "2.21.4" );
+return ( "2.22.0" );
 }
 
 sub script_snappymail_version_desc
diff --git a/package.json b/package.json
index 0c3d296cb..7e38a01e4 100644
--- a/package.json
+++ b/package.json
@@ -3,7 +3,7 @@
   "title": "SnappyMail",
   "description": "Simple, modern & fast web-based email client",
   "private": true,
-  "version": "2.21.4",
+  "version": "2.22.0",
   "homepage": "https://snappymail.eu",
   "author": {
     "name": "DJ Maze",