From 9901788db67cb09843752652d6170aeeead50e0e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julio=20Garc=C3=ADa?= Date: Mon, 20 Apr 2015 09:51:02 +0200 Subject: [PATCH] Revert "Update news for next release" This reverts commit cd47c926c92c29c7ee63c3990417883d60be2be7. Conflicts: NEWS --- NEWS | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/NEWS b/NEWS index 6b138dd08..08b83e687 100644 --- a/NEWS +++ b/NEWS @@ -76,23 +76,6 @@ Bug fixes - fixed plain/text mails showing on one line on Android/EAS (#3055) - fixed exception in sogo-tool when parsing arguments of a set operation -<<<<<<< HEAD -======= -2.2.15-zentyal2 (2015-03-16) ----------------------------- - -Enhancements - - Give support to calendar sharing invitations - - Missing contact fields are now saved and available when sharing it - (Office, Profession, Manager's name, Assistant's name, Spouse/Partner, Anniversary) - - Appointment color and importance work now between Outlooks - -Bug fixes - - Fix sender on importing email messages like event invitations - - Fix Outlook crashes when modifying the view of a folder - - Fix server side crash when reading some recurrence appointments - ->>>>>>> parent of 8706443... Prepare for 2.2.17a-zentyal1 2.2.15 (2015-01-30) -------------------