Georg Ehrke 4c2cf35050 fix merge conflicts		2012-04-22 13:19:12 +02:00
..
activation.php	implement shared calendar activation on server side	2012-04-18 11:50:12 +02:00
changepermission.php	fix merge conflicts	2012-04-22 13:19:12 +02:00
dropdown.php	remove the require_once lib base from all (or nearly all) files	2012-04-17 19:31:29 +02:00
share.php	fix merge conflicts	2012-04-22 13:19:12 +02:00
unshare.php	fix merge conflicts	2012-04-22 13:19:12 +02:00