PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

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

Browse source
This commit is contained in:
RiotTranslate 2017-05-30 16:28:57 +00:00
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 ampm = date.getHours() >= 12 ? 'PM' : 'AM';
hours = pad(hours ? hours : 12);
return `${hours}:${minutes} ${ampm}`;
return `${hours}:${minutes}${ampm}`;
}
module.exports = {