Jaco Greeff 121b742482 Merge branch 'master' into ui-2 ...

# Conflicts:
#	Cargo.lock
#	ethcore/src/evm/instructions.rs
#	js/package.json
#	js/src/modals/CreateAccount/AccountDetails/accountDetails.js
#	js/src/modals/FirstRun/TnC/tnc.js
#	js/src/modals/FirstRun/Welcome/welcome.js
#	js/src/ui/Form/Input/input.js
#	js/src/views/Accounts/accounts.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-14 10:16:42 +02:00

..

rules

Ui 2 mui to sui conversion (#5633)

2017-05-16 12:25:47 +02:00

app.js

Merge branch 'master' into ui-2

2017-06-14 10:16:42 +02:00

build.server.js

UI server refactoring (#5580)

2017-05-24 12:24:07 +02:00

dev.server.js

UI server refactoring (#5580)

2017-05-24 12:24:07 +02:00

embed.js

Build embedded Parity JS properly and separatly (#4426)

2017-02-09 15:30:57 +01:00

libraries.js

Merge branch 'master' into ui-2

2017-06-14 10:16:42 +02:00

npm.js

Merge branch 'master' into ui-2

2017-05-22 11:50:15 +02:00

shared.js

Merge branch 'master' into ui-2

2017-05-24 14:09:51 +02:00

test.js

Ui 2 Select component conversion (#5598)

2017-05-11 14:02:27 +02:00

vendor.js

Merge branch 'master' into ui-2

2017-05-22 11:50:15 +02:00