Conflicts: apps/contacts/lib/addressbook.php apps/files_sharing/js/share.js apps/files_sharing/sharedstorage.php |
||
---|---|---|
.. | ||
ajax | ||
css | ||
img | ||
js | ||
l10n | ||
lostpassword | ||
templates | ||
minimizer.php | ||
strings.php |
Conflicts: apps/contacts/lib/addressbook.php apps/files_sharing/js/share.js apps/files_sharing/sharedstorage.php |
||
---|---|---|
.. | ||
ajax | ||
css | ||
img | ||
js | ||
l10n | ||
lostpassword | ||
templates | ||
minimizer.php | ||
strings.php |