Merge branch 'main' of https://github.com/mail-in-a-box/mailinabox

# Conflicts:
#	README.md

CHANGELOG.md

@@ -1,13 +1,18 @@
 CHANGELOG
 =========
 
-In Development
---------------
+Version 62 (May 20, 2023)
+-------------------------
 
 Package updates:
 
 * Nextcloud updated to 23.0.12 (and its apps also updated).
 * Roundcube updated to 1.6.1.
+* Z-Push to 2.7.0, which has compatibility for Ubuntu 22.04, so it works again.
+
+Mail:
+
+* Roundcube's password change page is now working again.
 
 Control panel:
 

README.md

@@ -86,4 +86,3 @@ This is a convenient way to run ldapsearch having all the correct command line a
 ## Migration
 
 Running any of the setup scripts to install MiaB-LDAP (`miab`, `setup/bootstrap.sh`, `setup/start.sh`, etc) will automatically migrate your current installation from sqlite to LDAP. Ensure you've backed up user-data before running.
-

setup/bootstrap.sh

@@ -51,7 +51,7 @@ if [ -z "$TAG" ]; then
 	if [ "$UBUNTU_VERSION" == "Ubuntu 22.04 LTS" ]; then
 		# This machine is running Ubuntu 22.04, which is supported by
 		# Mail-in-a-Box versions 60 and later.
-		TAG=v61.1
+		TAG=v62
 	elif [ "$UBUNTU_VERSION" == "Ubuntu 18.04 LTS" ]; then
 		# This machine is running Ubuntu 18.04, which is supported by
 		# Mail-in-a-Box versions 0.40 through 5x.