1
0
mirror of https://github.com/BoostIo/Boostnote synced 2025-12-13 09:46:22 +00:00

resolve conflict with master

This commit is contained in:
voidSatisfaction
2017-11-07 22:47:08 +09:00
parent e57fef2413
commit c8763063c0

View File

@@ -643,7 +643,7 @@ class NoteList extends React.Component {
const dateDisplay = moment(
config.sortBy === 'CREATED_AT'
? note.createdAt : note.updatedAt
).fromNow()
).fromNow('D')
if (isDefault) {
return (