Jaco Greeff 7bbd48a2bd Merge branch 'master' into ui-2 ... # Conflicts: # js/package.json # js/src/api/local/ethkey/worker.js # js/src/modals/FirstRun/TnC/tnc.js # js/src/modals/FirstRun/Welcome/welcome.js # js/src/ui/Form/Input/input.js # js/src/ui/VaultCard/Accounts/accounts.spec.js # js/src/views/Accounts/accounts.js # js/src/views/Application/TabBar/tabBar.js # js/src/views/Settings/Views/defaults.js # js/src/views/Settings/Views/views.js # js/webpack/app.js # js/webpack/libraries.js		2017-06-13 11:02:38 +02:00
..
add_license.sh	Fixing coverage script.	2016-07-11 18:41:26 +02:00
contractABI.js	Update dependencies and bigint api (#5685)	2017-05-24 12:31:33 +02:00
cov.sh	Merge branch 'master' into ui-2	2017-06-13 11:02:38 +02:00
deb-build.sh	Add Installed-Size to deb build	2017-05-26 14:56:51 +03:00
deploy.sh	Create deploy.sh	2016-09-14 03:05:19 +07:00
doc.sh	Updating UI	2016-07-14 19:32:15 +02:00
docker-build.sh	fix docker build (ethcore+parity hub's)	2017-05-04 23:46:25 +03:00
fmt.sh	Fixing coverage script.	2016-07-11 18:41:26 +02:00
hook.sh	Fixing coverage script.	2016-07-11 18:41:26 +02:00
parity.service	start parity after network.target (#4952)	2017-03-19 08:52:00 +01:00
snapcraft.yaml	Add the packaging metadata to build the parity snap (#5496)	2017-04-25 16:20:57 +02:00
targets.sh	UI server refactoring (#5580)	2017-05-24 12:24:07 +02:00