mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web synced 2024-11-27 03:36:07 +03:00
Code Issues Projects Releases Packages Wiki Activity

Fix merge fail

Browse source
This commit is contained in:
David Baker 2017-05-26 17:55:48 +01:00
parent c22978d033
commit 40680d55e0
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/DateUtils.js
View file

@ -62,6 +62,8 @@ function twelveHourTime(date) {
module.exports = {
formatDate: function(date) {
var now = new Date();
const days = getDaysArray();
const months = getMonthsArray();
if (date.toDateString() === now.toDateString()) {
return this.formatTime(date);
}