Merge pull request #422 from mattermost/ampm-fix

Fixing AM-PM issue

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;