Skip to content

Commit

Permalink
Merge pull request #759 from WorldBrain/master
Browse files Browse the repository at this point in the history
0.15.1 from master into develop
  • Loading branch information
blackforestboi committed Mar 19, 2019
2 parents 7aabb3a + cae778d commit 2a5946c
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion package.json
@@ -1,6 +1,6 @@
{
"name": "worldbrain-extension",
"version": "0.15.0",
"version": "0.15.1",
"homepage": "https://worldbrain.io",
"license": "MIT",
"repository": {
Expand Down
2 changes: 1 addition & 1 deletion src/util/nice-time.test.js
Expand Up @@ -17,7 +17,7 @@ describe('niceTime', () => {
test('should return timeperiod stamp for timeperiod less than 24 hours', () => {
const date = new Date(2016, 7, 2, 14, 25)
const now = new Date(2016, 7, 2, 18, 55)
expect(niceTime(date, { now })).toBe('14:25')
expect(niceTime(date, { now })).toBe('Today 14:25')
})

test('should return the timeperiod stamp and the day for timeperiod less than 24 hours but not on the same day', () => {
Expand Down

0 comments on commit 2a5946c

Please sign in to comment.