amorfo77/sogo
1
0 Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-11-08 02:07:09 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into fix-some-warnings

Browse Source 
Conflicts:
	SoObjects/Appointments/SOGoAppointmentObject.m
This commit is contained in:
Patrice Levesque committed 2016-02-15 11:23:27 -05:00
2 parents 9e83ff9f04 f2ffb52318
commit a5cc2bb5d5
66 files changed
+676 -343
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

SoObjects/Appointments/SOGoTaskObject.m
+1 -2
View File
@@ -1,6 +1,5 @@
/*
Copyright (C) 2006-2014 Inverse inc.
Copyright (C) 2004-2005 SKYRIX Software AG
Copyright (C) 2006-2014-2016 Inverse inc.
This file is part of SOGo.