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

merged 

Monotone-Parent: 8a33d1f9394c9fbaada3fcd1f51d3ba2fb6de40e
Monotone-Revision: 4371482c9c25a9757f941f8b27520cda720cea01

Monotone-Author: ludovic@Sophos.ca
Monotone-Date: 2010-09-14T21:37:10
Monotone-Branch: ca.inverse.sogo
maint-2.0.2
Ludovic Marcotte 2010-09-14 21:37:10 +00:00
parent fa99b2bfed
commit 7d56370ae1
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
2010-09-14 Ludovic Marcotte <lmarcotte@inverse.ca>
* SoObjects/Appointments/SOGoUserFolder+Appointments.m
@ -6,7 +5,6 @@
the schedule-inbox-URL if the CAL is iCal and
the owner isn't the current user
>>>>>>> variant B
2010-09-14 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* UI/Common/UIxPageFrame.m (-systemAdditionalJSFiles): new web
@ -15,8 +13,6 @@
* SoObjects/SOGo/SOGoDomainDefaults.m (-additionalJSFiles): new
accessor for the new "SOGoUIAdditionalJSFiles" user default.
####### Ancestor
======= end
2010-09-13 Ludovic Marcotte <lmarcotte@inverse.ca>
* Updated Ukrainian translation - patch from