diff --git a/core/js/dist/login.js b/core/js/dist/login.js
index c5c8e8da9291d49ed7b56e401a6ba8e298d9f4e1..fc7f1aabd89c925d0b35bd28bdf10ee0386c4834 100644
Binary files a/core/js/dist/login.js and b/core/js/dist/login.js differ
diff --git a/core/js/dist/login.js.map b/core/js/dist/login.js.map
index 20dacfa5ff2e2b8f58102224700c71f1de670870..95ce5e0faf96d83e933b7eedbe3a5ec4c8052efe 100644
Binary files a/core/js/dist/login.js.map and b/core/js/dist/login.js.map differ
diff --git a/core/js/dist/main.js b/core/js/dist/main.js
index 6575858cf0e0b68606de924b7f062868dfbcc2f0..b8c4342fe89c8e78b6e4cd8904952f7910f3e341 100644
Binary files a/core/js/dist/main.js and b/core/js/dist/main.js differ
diff --git a/core/js/dist/main.js.map b/core/js/dist/main.js.map
index 08ccb39e7ad40f58f24bd8f1c9f8c61995586d6f..52b275c6f95dc5b9979f384e588bf7e6c8ed1847 100644
Binary files a/core/js/dist/main.js.map and b/core/js/dist/main.js.map differ
diff --git a/core/js/dist/maintenance.js b/core/js/dist/maintenance.js
index 49a9c1a701f7c03a2180be2d9b03ae702bdc15a9..751301e5706801c2a5816dae5a21b4501843da84 100644
Binary files a/core/js/dist/maintenance.js and b/core/js/dist/maintenance.js differ
diff --git a/core/js/dist/maintenance.js.map b/core/js/dist/maintenance.js.map
index aaa046c5ff05fff3cd73862ead1e2bb9dba5fc44..e10e5d5e3d8539bd403c089d5e3e52cecbaf3f4a 100644
Binary files a/core/js/dist/maintenance.js.map and b/core/js/dist/maintenance.js.map differ
diff --git a/core/src/OC/dialogs.js b/core/src/OC/dialogs.js
index 37d8e0724f2ef432923f9700e3800cca46a84de9..380aeb3a76b982a91bc45b8ca15906ef70af39da 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 = {