Skip to content

Commit

Permalink
Merge branch 'master' of github.com:ssbc/patchbay
Browse files Browse the repository at this point in the history
  • Loading branch information
mixmix committed Oct 31, 2018
2 parents 8a84536 + d9f7833 commit 9aebdc3
Show file tree
Hide file tree
Showing 2 changed files with 61 additions and 72 deletions.
131 changes: 60 additions & 71 deletions package-lock.json

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

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@
},
"devDependencies": {
"electro": "^2.1.1",
"electron": "^3.0.6",
"electron": "^2.0.12",
"eslint-config-standard": "^12.0.0",
"standard": "^12.0.1"
}
Expand Down

0 comments on commit 9aebdc3

Please sign in to comment.