mirror of
https://github.com/inverse-inc/sogo.git
synced 2026-05-26 22:05:23 +00:00
Monotone-Parent: ac81d77fda86dad3ce300e48e20f65bd639b24cb
Monotone-Revision: 55d114b1af490a0c317169a03805f2c3a6873525 Monotone-Author: flachapelle@inverse.ca Monotone-Date: 2012-02-03T17:00:47 Monotone-Branch: ca.inverse.sogo
This commit is contained in:
@@ -1,4 +1,3 @@
|
||||
<<<<<<< variant A
|
||||
2012-02-02 Francis Lachapelle <flachapelle@inverse.ca>
|
||||
|
||||
* UI/MailerUI/UIxMailMainFrame.m (-composeAction): recipient
|
||||
@@ -8,7 +7,6 @@
|
||||
received "mailto" parameter is now a JSON-formatted string; we
|
||||
parse it accordingly.
|
||||
|
||||
>>>>>>> variant B
|
||||
2012-02-03 Wolfgang Sourdeau <wsourdeau@inverse.ca>
|
||||
|
||||
* OpenChange/MAPIStoreSOGo.m (sogo_backend_create_root_folder):
|
||||
@@ -49,8 +47,6 @@
|
||||
* OpenChange/MAPIApplication.m (-setUserContext:): do not retain
|
||||
the user context.
|
||||
|
||||
####### Ancestor
|
||||
======= end
|
||||
2012-02-01 Francis Lachapelle <flachapelle@inverse.ca>
|
||||
|
||||
* UI/WebServerResources/UIxCalUserRightsEditor.js (onUpdateACL):
|
||||
|
||||
Reference in New Issue
Block a user