Tobias Hößl 7f4cb9cf06 Merge branch 'master' of github.com:CatoTH/friendica-addons ... Conflicts: dav/common/calendar_rendering.fnk.php		2012-08-11 08:08:23 +00:00
..
wdcal/js
calendar.fnk.php	Second part of refactoring; should be runnable again, yet not thoroughly tested	2012-08-11 08:07:19 +00:00
calendar_rendering.fnk.php	Second part of refactoring; should be runnable again, yet not thoroughly tested	2012-08-11 08:07:19 +00:00
dav_caldav_backend_common.inc.php	Second part of refactoring; should be runnable again, yet not thoroughly tested	2012-08-11 08:07:19 +00:00
dav_caldav_backend_private.inc.php
dav_caldav_backend_virtual.inc.php
dav_caldav_calendar_private.inc.php
dav_caldav_calendar_virtual.inc.php
dav_caldav_root.inc.php
dav_carddav_backend_common.inc.php
dav_carddav_backend_private.inc.php
dav_carddav_backend_virtual.inc.php
dav_carddav_root.inc.php
dav_user_addressbooks.inc.php
dav_user_calendars.inc.php
wdcal.js
wdcal_backend.inc.php	Second part of refactoring; should be runnable again, yet not thoroughly tested	2012-08-11 08:07:19 +00:00
wdcal_configuration.php
wdcal_edit.inc.php