lingble/archived-Mailu
1
0
Fork 0
mirror of https://github.com/lingble/Mailu.git synced 2026-03-20 03:50:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Resolve merge conflict

Browse Source 
(cherry picked from commit 6581f8f087)

# Conflicts:
#	CHANGELOG.md
This commit is contained in:
Dimitri Huisman
2021-08-06 23:17:41 +02:00
committed by Mergify
parent 9023e734c7
commit c36dd210f4
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
CHANGELOG.md
View File

@@ -468,19 +468,19 @@ The Dovecot and Postfix overrides are moved in their own sub-directory.
If there are local override files, they will need to be moved from overrides/ to overrides/dovecot and overrides/postfix/.
See https://mailu.io/1.8/faq.html#how-can-i-override-settings for all the mappings.
<<<<<<< HEAD
Please note that the shipped image for PostgreSQL database is deprecated.
We advise to switch to an external database server.
=======
One major change for the docker compose file is that the antispam needs a fixed hostname [#1837](https://github.com/Mailu/Mailu/issues/1837).
This is handled when you regenerate the docker-compose file. A fixed hostname is required to retain rspamd history.
One major change for the docker compose file is that the antispam container needs a fixed hostname [#1837](https://github.com/Mailu/Mailu/issues/1837).
This is handled when you regenerate the docker-compose file. A fixed hostname is required to retain rspamd history.
This is also handled in the helm-chart repo.
Please not that the shipped image for PostgreSQL database is deprecated.
We advise to switch to an external PostgreSQL database server.
>>>>>>> afaacf5a... Update CHANGELOG.md and process towncrier newsfragments.
<<<<<<< HEAD
<!-- TOWNCRIER -->
>>>>>>> a7d99bde (Update CHANGELOG.md and process towncrier newsfragments.)
=======
>>>>>>> 6581f8f0 (Resolve merge conflict)
1.8.0 - 2021-08-06
--------------------