Skip to content

Commit

Permalink
Merge branch 'patch/v0.14.x'
Browse files Browse the repository at this point in the history 
* patch/v0.14.x:
  Update dependencies
  Improve handling of PTS rollover initPTS calculation #3082

# Conflicts:
#	package-lock.json (updated with `npm audit fix`)
  • Loading branch information
Rob Walch committed Oct 12, 2020
2 parents 29ae941 + 6ee48a2 commit c6739d3
Showing 1 changed file with 32 additions and 44 deletions.
76 changes: 32 additions & 44 deletions package-lock.json
View file

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

0 comments on commit c6739d3

Please sign in to comment.