Commit c1742472 authored by Luke Schoen's avatar Luke Schoen
Browse files

Merge branch 'master' into luke-264-account-screen-menu-alternative

parents a9b3ae6e 32b6f35d
Pipeline #28556 passed with stage
in 1 minute and 48 seconds
......@@ -25,7 +25,7 @@
],
"homepage": "https://github.com/paritytech/fether",
"parity": {
"channel": "beta"
"channel": "stable"
},
"scripts": {
"prebuild": "copyfiles -u 2 \"../fether-react/build/**/*\" static/ && ./scripts/fixElectronBug.sh",
......@@ -56,4 +56,4 @@
"electron-webpack": "^2.1.2",
"webpack": "^4.7.0"
}
}
\ No newline at end of file
}
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment