1
0
mirror of https://github.com/mail-in-a-box/mailinabox.git synced 2025-04-21 03:02:09 +00:00

Removed merge artifact from CHANGELOG.md

This commit is contained in:
yodax 2018-10-10 08:26:03 +02:00
parent 1044ef3372
commit 582c9a1a5c

View File

@ -7,8 +7,6 @@ In Development
--------------
* Starting with v0.28, TLS certificate provisioning wouldn't work on new boxes until the mailinabox setup command was run a second time because of a problem with the non-interactive setup.
<<<<<<< HEAD
* Update to Nextcloud 13.0.6.
* Update to Roundcube 1.3.7.
* Update to Z-Push 2.4.4.