From: Vincent Petry <pvince81@owncloud.com>
Date: Tue, 24 Mar 2015 10:08:53 +0000 (+0100)
Subject: Revert "Change to 24H format instead of 12H format"
X-Git-Tag: v8.1.0alpha1~210
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=ce5d2ab7dbe9e4ca67c12ba1f5506619b639ddb7;p=nextcloud-server.git

Revert "Change to 24H format instead of 12H format"

This reverts commit 8279dde97a8f93b74eb733d243d6a5bb41aa15e3.
---

diff --git a/core/js/js.js b/core/js/js.js
index e65b33d8607..f24694124ad 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -1338,7 +1338,7 @@ OC.Util = {
 	 * @returns {string} timestamp formatted as requested
 	 */
 	formatDate: function (timestamp, format) {
-		format = format || "MMMM D, YYYY H:mm";
+		format = format || "MMMM D, YYYY h:mm";
 		return moment(timestamp).format(format);
 	},