bf1057143c
Conflicts: apps/files/js/filelist.js core/js/js.js lib/ocs.php |
||
---|---|---|
.. | ||
ajax | ||
css | ||
img | ||
js | ||
l10n | ||
lostpassword | ||
templates | ||
minimizer.php | ||
routes.php | ||
strings.php |
bf1057143c
Conflicts: apps/files/js/filelist.js core/js/js.js lib/ocs.php |
||
---|---|---|
.. | ||
ajax | ||
css | ||
img | ||
js | ||
l10n | ||
lostpassword | ||
templates | ||
minimizer.php | ||
routes.php | ||
strings.php |