Merge branch 'develop' of github.com:vector-im/vector-web into develop

dbkr · dbkr · commit f618585bd670 · 2015-10-23T09:25:15.000+01:00
diff --git a/src/skins/vector/views/atoms/MessageTimestamp.js b/src/skins/vector/views/atoms/MessageTimestamp.js
@@ -45,7 +45,7 @@ module.exports = React.createClass({
             return days[date.getDay()] + ", " + months[date.getMonth()] + " " + (date.getDay()+1) + " " + pad(date.getHours()) + ':' + pad(date.getMinutes());
         }
         else {
-            return days[date.getDay()] + ", " + months[date.getMonth()] + " " + (date.getDay()+1) + " " + date().getFullYear() + " " + pad(date.getHours()) + ':' + pad(date.getMinutes());
+            return days[date.getDay()] + ", " + months[date.getMonth()] + " " + (date.getDay()+1) + " " + date.getFullYear() + " " + pad(date.getHours()) + ':' + pad(date.getMinutes());
         }
     },
 

Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ module.exports = React.createClass({`
`45`	`45`	`return days[date.getDay()] + ", " + months[date.getMonth()] + " " + (date.getDay()+1) + " " + pad(date.getHours()) + ':' + pad(date.getMinutes());`
`46`	`46`	`}`
`47`	`47`	`else {`
`48`		`- return days[date.getDay()] + ", " + months[date.getMonth()] + " " + (date.getDay()+1) + " " + date().getFullYear() + " " + pad(date.getHours()) + ':' + pad(date.getMinutes());`
	`48`	`+ return days[date.getDay()] + ", " + months[date.getMonth()] + " " + (date.getDay()+1) + " " + date.getFullYear() + " " + pad(date.getHours()) + ':' + pad(date.getMinutes());`
`49`	`49`	`}`
`50`	`50`	`},`
`51`	`51`