Skip to content

Commit

Permalink
Merge branch 'master' into core
Browse files Browse the repository at this point in the history
Conflicts:
	package-lock.json
	package.json
  • Loading branch information
tungs committed Dec 27, 2021
2 parents 5bb2c63 + 0b49d4b commit cb0aa0d
Show file tree
Hide file tree
Showing 2 changed files with 74 additions and 72 deletions.
142 changes: 72 additions & 70 deletions package-lock.json

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

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "timecut-core",
"version": "0.3.2-prerelease",
"version": "0.3.2",
"description": "Record smooth movies of web pages",
"repository": {
"type": "git",
Expand All @@ -18,7 +18,7 @@
},
"license": "BSD-3-Clause",
"dependencies": {
"timesnap-core": "0.3.1"
"timesnap-core": "0.3.2"
},
"devDependencies": {
"eslint": "^6.8.0"
Expand Down

0 comments on commit cb0aa0d

Please sign in to comment.