cbaf858dea
Conflicts: apps/files/js/fileactions.js apps/files_archive/js/archive.js |
||
---|---|---|
.. | ||
ajax | ||
appinfo | ||
css | ||
img | ||
js | ||
l10n | ||
lib | ||
templates | ||
index.php | ||
sharing.php |
cbaf858dea
Conflicts: apps/files/js/fileactions.js apps/files_archive/js/archive.js |
||
---|---|---|
.. | ||
ajax | ||
appinfo | ||
css | ||
img | ||
js | ||
l10n | ||
lib | ||
templates | ||
index.php | ||
sharing.php |