public/Boostnote
1
0
Fork 0
mirror of https://github.com/BoostIo/Boostnote synced 2025-12-17 11:41:44 +00:00
Code Issues Releases Wiki Activity

resolve conflict with master

Browse Source
This commit is contained in:
voidSatisfaction
2017-11-07 22:47:08 +09:00
parent e57fef2413
commit c8763063c0
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
browser/main/NoteList/index.js
View File

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