summaryrefslogtreecommitdiffstats
path: root/core/js
diff options
context:
space:
mode:
authorVincent Petry <pvince81@owncloud.com>2015-03-24 11:08:53 +0100
committerVincent Petry <pvince81@owncloud.com>2015-03-24 11:08:53 +0100
commitce5d2ab7dbe9e4ca67c12ba1f5506619b639ddb7 (patch)
treea1ef326234ab874378449dca3a27c1316a02aedd /core/js
parent9cb07f126d027ddc0610fe0fcfd43016bc960ddb (diff)
downloadnextcloud-server-ce5d2ab7dbe9e4ca67c12ba1f5506619b639ddb7.tar.gz
nextcloud-server-ce5d2ab7dbe9e4ca67c12ba1f5506619b639ddb7.zip
Revert "Change to 24H format instead of 12H format"
This reverts commit 8279dde97a8f93b74eb733d243d6a5bb41aa15e3.
Diffstat (limited to 'core/js')
-rw-r--r--core/js/js.js2
1 files changed, 1 insertions, 1 deletions
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);
},