4c7fd8cd01
Conflicts: lib/group.php lib/group/backend.php lib/group/database.php lib/group/interface.php lib/public/user.php lib/user.php lib/user/backend.php lib/user/database.php lib/user/interface.php |
||
---|---|---|
.. | ||
calendar.php | ||
part.choosecalendar.php | ||
part.choosecalendar.rowfields.php | ||
part.choosecalendar.rowfields.shared.php | ||
part.editcalendar.php | ||
part.editevent.php | ||
part.eventform.php | ||
part.import.php | ||
part.newevent.php | ||
part.showevent.php | ||
settings.php | ||
share.dropdown.php |