diff options
author | Jan-Christoph Borchardt <hey@jancborchardt.net> | 2015-03-24 13:30:52 +0100 |
---|---|---|
committer | Jan-Christoph Borchardt <hey@jancborchardt.net> | 2015-03-24 13:30:52 +0100 |
commit | 83580d08ebb5efd212cef1dc61e3c4427a556786 (patch) | |
tree | b4c763d8e47b838adb452da9abdaa7b21fe6295d | |
parent | 46475bf580f4895899a4b924a8970e91163e3c63 (diff) | |
parent | 946a7c3a8360f304eb93d14ec82107efddce8a38 (diff) | |
download | nextcloud-server-83580d08ebb5efd212cef1dc61e3c4427a556786.tar.gz nextcloud-server-83580d08ebb5efd212cef1dc61e3c4427a556786.zip |
Merge pull request #15143 from owncloud/24h-time-format
Use 24h format instead of 12h format
-rw-r--r-- | core/js/js.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/js/js.js b/core/js/js.js index f24694124ad..e65b33d8607 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); }, |