Merge branch 'development' into signal-1.24

pull/272/head
Mikunj 6 years ago
commit a8a959b326

@ -45,10 +45,7 @@ describe('Attachment', () => {
data: stringToArrayBuffer('foo'), data: stringToArrayBuffer('foo'),
contentType: MIME.VIDEO_QUICKTIME, contentType: MIME.VIDEO_QUICKTIME,
}; };
// Unix timestamp of start of year 2000 to fix odd sudo timezone bug const timestamp = moment('2000-01-01').toDate();
const timestamp = new Date(
946684800000 - moment().utcOffset() * 60 * 1000
);
const actual = Attachment.getSuggestedFilename({ const actual = Attachment.getSuggestedFilename({
attachment, attachment,
timestamp, timestamp,

Loading…
Cancel
Save