94ce8f2168
Conflicts: apps/contacts/lib/app.php apps/files_sharing/js/share.js |
||
---|---|---|
.. | ||
ajax | ||
appinfo | ||
css | ||
js | ||
l10n | ||
templates | ||
admin.php | ||
download.php | ||
index.php | ||
settings.php | ||
share.php |
94ce8f2168
Conflicts: apps/contacts/lib/app.php apps/files_sharing/js/share.js |
||
---|---|---|
.. | ||
ajax | ||
appinfo | ||
css | ||
js | ||
l10n | ||
templates | ||
admin.php | ||
download.php | ||
index.php | ||
settings.php | ||
share.php |