f4a8c233cf
Conflicts: apps/calendar/appinfo/app.php |
||
---|---|---|
.. | ||
alarm.php | ||
app.php | ||
attendees.php | ||
calendar.php | ||
connector_sabre.php | ||
hooks.php | ||
object.php | ||
search.php | ||
share.php |
f4a8c233cf
Conflicts: apps/calendar/appinfo/app.php |
||
---|---|---|
.. | ||
alarm.php | ||
app.php | ||
attendees.php | ||
calendar.php | ||
connector_sabre.php | ||
hooks.php | ||
object.php | ||
search.php | ||
share.php |