From 93712c8ce405d96e4b681d547d648187ec2a6a92 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim=20M=C3=B6hlmann?= Date: Tue, 12 Feb 2019 18:18:52 +0200 Subject: [PATCH] Update CHANGELOG.md (cherry picked from commit c1485f9381be87dd4d8d0662171e81ab9000dead) # Conflicts: # CHANGELOG.md --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index d69ea664..c3411d0f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -565,6 +565,11 @@ deprecated before 1.8.0, you can switch to an external database server by then. - Enhancement: Create an Authentication Token with IPv6 address restriction ([#829](https://github.com/Mailu/Mailu/issues/829)) - Enhancement: Automatically create admin user on container startup if given appropriate environment variables - Enhancement: Missing wildcard option in alias flask command ([#869](https://github.com/Mailu/Mailu/issues/869)) +<<<<<<< HEAD +======= +- Bug: Fix poor performance if ANTIVIRUS is configured to none. +- Bug: Fix typo in migration script ([#905](https://github.com/Mailu/Mailu/issues/905)) +>>>>>>> c1485f93 (Update CHANGELOG.md) v1.6.0 - 2019-01-18 -------------------