diff options
| author | Joram Wilander <jwawilander@gmail.com> | 2015-08-20 15:26:30 -0400 |
|---|---|---|
| committer | Joram Wilander <jwawilander@gmail.com> | 2015-08-20 15:26:30 -0400 |
| commit | 626c7d525cfdb65f95afb6674dba033b00d97f6b (patch) | |
| tree | 658f95bc7b0ee56a3629c6772723f739755e0704 /web | |
| parent | 2398d768d53039273a9edb657d9466f7a9d67a91 (diff) | |
| parent | 24c13730efd74a38a7775fdc39d3c80b4ddaca57 (diff) | |
| download | chat-626c7d525cfdb65f95afb6674dba033b00d97f6b.tar.gz chat-626c7d525cfdb65f95afb6674dba033b00d97f6b.tar.bz2 chat-626c7d525cfdb65f95afb6674dba033b00d97f6b.zip | |
Merge pull request #422 from mattermost/ampm-fix
Fixing AM-PM issue
Diffstat (limited to 'web')
| -rw-r--r-- | web/react/utils/utils.jsx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/web/react/utils/utils.jsx b/web/react/utils/utils.jsx index df7a1e697..09cd299df 100644 --- a/web/react/utils/utils.jsx +++ b/web/react/utils/utils.jsx @@ -167,7 +167,7 @@ module.exports.displayTime = function(ticks) { var ampm = 'AM'; if (hours >= 12) { - ampm = 'AM'; + ampm = 'PM'; } hours = hours % 12; |