9832a0817d
Conflicts: apps/calendar/index.php |
||
---|---|---|
.. | ||
ajax | ||
css | ||
img | ||
js | ||
l10n | ||
lostpassword | ||
templates | ||
strings.php |
9832a0817d
Conflicts: apps/calendar/index.php |
||
---|---|---|
.. | ||
ajax | ||
css | ||
img | ||
js | ||
l10n | ||
lostpassword | ||
templates | ||
strings.php |