0
0
mirror of https://github.com/postfixadmin/postfixadmin.git synced 2024-09-19 19:22:14 +02:00

fix merge conflict leftover in changelog

This commit is contained in:
Christian Boltz 2021-05-13 21:38:25 +02:00
parent 5a305bc830
commit 7bf1bb9ffa
No known key found for this signature in database
GPG Key ID: C6A682EA63C82F1C

View File

@ -31,7 +31,6 @@ Version 3.3.9 - 2021/05/12
- Add domain_admins.id pk column for non-sqlite users, see: https://github.com/postfixadmin/postfixadmin/issues/475
- Add fix for MySQL error where a default datetime value in the domain field breaks the upgrade.php db schema update, see https://github.com/postfixadmin/postfixadmin/issues/489
- Bug fix quota levels (now user configurable again; thanks @csware, see https://github.com/postfixadmin/postfixadmin/commit/bfc7af5c8efe2a68c47286cc870b56cb4f929a3f
>>>>>>> postfixadmin_3.3
Version 3.3.8 - 2021/03/04
-------------------------------------------------