Skip to content
Permalink
Browse files

Merge branch 'develop' of github.com:input-output-hk/daedalus into fi…

…x/ddw-666-fix-ekg-server-port-collision-in-development-environment
  • Loading branch information...
Sam-Jeston committed May 16, 2019
2 parents 4b33488 + fb8c35d commit 5f734b4489ad9c655c7eaceb3e486e86873259aa
Showing with 3 additions and 0 deletions.
  1. +1 −0 CHANGELOG.md
  2. +1 −0 package.json
  3. +1 −0 yarn2nix.nix
@@ -22,6 +22,7 @@ Changelog

### Chores

- Setup storybook build script to deploy previews for the QA team to Netlify ([1391](https://github.com/input-output-hk/daedalus/pull/1391))
- Added unit tests for mnemonic generation and validation ([PR 1379](https://github.com/input-output-hk/daedalus/pull/1379))
- Simplified the test setup ([PR 1378](https://github.com/input-output-hk/daedalus/pull/1378))
- Updated PR template ([PR 1376](https://github.com/input-output-hk/daedalus/pull/1376))
@@ -27,6 +27,7 @@
"prettier:format": "yarn prettier --write --loglevel warn",
"manage:translations": "gulp purge:translations && gulp clear:cache && gulp build && node ./translations/translation-runner.js",
"storybook": "start-storybook -p 6006 -c storybook",
"storybook:build": "build-storybook -c storybook -o dist/storybook",
"clear:cache": "gulp clear:cache",
"nix:dev": "nix-shell --arg autoStartBackend true --arg allowFaultInjection true --arg systemStart",
"nix:staging": "nix-shell --arg autoStartBackend true --argstr cluster staging"
@@ -110,6 +110,7 @@ yarn2nix.mkYarnPackage {
buildInputs = [ python ];
postInstall = ''
yarn --offline run build
rm build/config.gypi
'';
};
flow-bin = {

0 comments on commit 5f734b4

Please sign in to comment.
You can’t perform that action at this time.