bf1057143c
Conflicts: apps/files/js/filelist.js core/js/js.js lib/ocs.php |
||
---|---|---|
.. | ||
admin.js | ||
fileactions.js | ||
filelist.js | ||
files.js | ||
jquery.fileupload.js | ||
jquery.iframe-transport.js | ||
timezone.js |
bf1057143c
Conflicts: apps/files/js/filelist.js core/js/js.js lib/ocs.php |
||
---|---|---|
.. | ||
admin.js | ||
fileactions.js | ||
filelist.js | ||
files.js | ||
jquery.fileupload.js | ||
jquery.iframe-transport.js | ||
timezone.js |