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

Fix merge fail

pull/21833/head
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);
}