diff options
Diffstat (limited to 'core/src/OC')
| -rw-r--r-- | core/src/OC/dialogs.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/src/OC/dialogs.js b/core/src/OC/dialogs.js index 37d8e0724f2..380aeb3a76b 100644 --- a/core/src/OC/dialogs.js +++ b/core/src/OC/dialogs.js @@ -787,11 +787,11 @@ const Dialogs = { $conflict.find('.filename').text(original.name) $originalDiv.find('.size').text(OC.Util.humanFileSize(original.size)) - $originalDiv.find('.mtime').text(formatDate(original.mtime)) + $originalDiv.find('.mtime').text(OC.Util.formatDate(original.mtime)) // ie sucks if (replacement.size && replacement.lastModifiedDate) { $replacementDiv.find('.size').text(OC.Util.humanFileSize(replacement.size)) - $replacementDiv.find('.mtime').text(formatDate(replacement.lastModifiedDate)) + $replacementDiv.find('.mtime').text(OC.Util.formatDate(replacement.lastModifiedDate)) } var path = original.directory + '/' + original.name var urlSpec = { |