From f999aa94e10d0b8a79eb63cee2208c19afc5f91c Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Sat, 19 Mar 2016 02:37:18 +0000
Subject: [PATCH] remove YYYY from timestamps to workaround
 https://github.com/vector-im/vector-web/issues/987

---
 src/DateUtils.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/DateUtils.js b/src/DateUtils.js
index 208134ee83..f291111981 100644
--- a/src/DateUtils.js
+++ b/src/DateUtils.js
@@ -34,12 +34,14 @@ module.exports = {
         else if (now.getTime() - date.getTime() < 6 * 24 * 60 * 60 * 1000) {
             return days[date.getDay()] + " " + pad(date.getHours()) + ':' + pad(date.getMinutes());
         }
-        else if (now.getFullYear() === date.getFullYear()) {
+        else /* if (now.getFullYear() === date.getFullYear()) */ {
             return days[date.getDay()] + ", " + months[date.getMonth()] + " " + date.getDate() + " " + pad(date.getHours()) + ':' + pad(date.getMinutes());
         }
+        /*
         else {
             return days[date.getDay()] + ", " + months[date.getMonth()] + " " + date.getDate() + " " + date.getFullYear() + " " + pad(date.getHours()) + ':' + pad(date.getMinutes());
         }
+        */
     }
 }