Andrew McMillan 4f444d8bfa Resolve merge conflicts. ...

Conflicts:

	docs/website/inc/page-header.php
	docs/website/installation.php

2007-12-07 09:23:35 +13:00

..

page-footer.php

New docs, saying DAViCal rather than RSCDS.

2007-11-04 23:32:22 +13:00

page-header.php

Resolve merge conflicts.

2007-12-07 09:23:35 +13:00

page-middle.php

Updated public website with much enhanced areas on configuration of clients.

2006-11-12 00:18:14 +13:00