OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

pull/21833/head
RiotTranslate 2017-05-30 16:28:57 +00:00
parent b09c673c6b 9975514850
commit 0e262e70f3
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/DateUtils.js
View File

@ -56,7 +56,7 @@ function twelveHourTime(date) {
const minutes = pad(date.getMinutes()); const minutes = pad(date.getMinutes());
const ampm = date.getHours() >= 12 ? 'PM' : 'AM'; const ampm = date.getHours() >= 12 ? 'PM' : 'AM';
hours = pad(hours ? hours : 12); hours = pad(hours ? hours : 12);
return `${hours}:${minutes} ${ampm}`; return `${hours}:${minutes}${ampm}`;
} }
module.exports = { module.exports = {