matrix/matrix-react-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-11-07 10:46:24 +03:00
Code 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
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 = { module.exports = {
formatDate: function(date) { formatDate: function(date) {
var now = new Date(); var now = new Date();
const days = getDaysArray();
const months = getMonthsArray();
if (date.toDateString() === now.toDateString()) { if (date.toDateString() === now.toDateString()) {
return this.formatTime(date); return this.formatTime(date);
} }