Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
@danielgolden
danielgolden committed Aug 17, 2020
2 parents a02ad64 + 59830e0 commit aaa17cf
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions package-lock.json
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 comment on commit aaa17cf

@danielgolden
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

oops, pushed straight to master

Please sign in to comment.