LupusNobilis
/
sogo
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merged 

Monotone-Parent: 59b56f2b68665cf95f155fd09f8d371b92ed3b5c
Monotone-Revision: 1d2d40d84e94a64591b3d3ea0025de0405dfd68c

Monotone-Author: ludovic@Sophos.ca
Monotone-Date: 2011-11-21T14:18:17
maint-2.0.2
Ludovic Marcotte 2011-11-21 14:18:17 +00:00
parent 73cb9d81dc
commit 489458cb14
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,4 +1,3 @@
<<<<<<< variant A
2011-11-21 Ludovic Marcotte <lmarcotte@inverse.ca>
* SoObjects/SOGo/WORequest+SOGo.m - for now, we consider iCal 4
@ -9,7 +8,6 @@
if we deal with Apple Address Book. If we don't do this and
a "vlist" is present, no card will be displayed at all.
>>>>>>> variant B
2011-11-21 Francis Lachapelle <flachapelle@inverse.ca>
* UI/WebServerResources/UIxPreferences.js (initPreferences):
@ -20,8 +18,6 @@
(-vacationEndDate, -setVacationEndDate:): getters/setters for the
new optional vacation end date.
####### Ancestor
======= end
2011-11-16 Ludovic Marcotte <lmarcotte@inverse.ca>
* SoObjects/SOGo/SOGoSieveManager.m (-updateFiltersForLogin:...)