forked from extern/egroupware
cb0fc5db82
svn merge -r 26935:HEAD ^/branches/SyncML-1.2/calendar . - with the exception of class.calendar_uiforms.inc.php, as it was not updated with the latest changes from trunk and I'm not sure about the changes --> needs further discussion, sorry :-( svn revert inc/class.calendar_uiforms.inc.php |
||
---|---|---|
.. | ||
doc | ||
egroupware.org | ||
importexport | ||
inc | ||
js | ||
setup | ||
sitemgr | ||
templates | ||
csv_import.php | ||
freebusy.php | ||
index.php |