mirror of
				https://github.com/mail-in-a-box/mailinabox.git
				synced 2025-10-30 18:50:53 +00:00 
			
		
		
		
	Merge branch 'main' of https://github.com/mail-in-a-box/mailinabox
# Conflicts: # README.md # setup/management.sh
This commit is contained in:
		
						commit
						37a7088531
					
				| @ -1,6 +1,11 @@ | ||||
| CHANGELOG | ||||
| ========= | ||||
| 
 | ||||
| Version 57a (June 19, 2022) | ||||
| --------------------------- | ||||
| 
 | ||||
| * The Backblaze backups fix posted in Version 57 was incomplete. It's now fixed. | ||||
| 
 | ||||
| Version 57 (June 12, 2022) | ||||
| -------------------------- | ||||
| 
 | ||||
|  | ||||
| @ -20,7 +20,7 @@ if [ -z "$TAG" ]; then | ||||
| 	# want to display in status checks. | ||||
| 	if [ "$(lsb_release -d | sed 's/.*:\s*//' | sed 's/18\.04\.[0-9]/18.04/' )" == "Ubuntu 18.04 LTS" ]; then | ||||
| 		# This machine is running Ubuntu 18.04. | ||||
| 		TAG=v57 | ||||
| 		TAG=v57a | ||||
| 
 | ||||
| 	elif [ "$(lsb_release -d | sed 's/.*:\s*//' | sed 's/14\.04\.[0-9]/14.04/' )" == "Ubuntu 14.04 LTS" ]; then | ||||
| 		# This machine is running Ubuntu 14.04. | ||||
|  | ||||
| @ -51,7 +51,8 @@ hide_output $venv/bin/pip install --upgrade \ | ||||
| 	rtyaml "email_validator>=1.0.0" "exclusiveprocess" \ | ||||
| 	flask dnspython python-dateutil expiringdict \ | ||||
| 	qrcode[pil] pyotp \ | ||||
| 	"idna>=2.0.0" "cryptography==2.2.2" boto psutil postfix-mta-sts-resolver b2sdk ldap3 | ||||
| 	"idna>=2.0.0" "cryptography==2.2.2" psutil postfix-mta-sts-resolver \ | ||||
| 	b2sdk==1.14.1 boto ldap3 | ||||
| 
 | ||||
| # CONFIGURATION | ||||
| 
 | ||||
|  | ||||
		Loading…
	
		Reference in New Issue
	
	Block a user