Jaco Greeff 054a6a9daf Merge branch 'master' into check-updates ... # Conflicts: # .gitlab-ci.yml # js/webpack/dev.server.js		2016-12-15 13:52:28 +01:00
..
rpctest	authors & homepage => Parity	2016-12-11 19:43:58 +01:00
src	Merge branch 'master' into check-updates	2016-12-15 13:52:28 +01:00
build.rs	Rename ethcore -> parity in license.	2016-12-11 19:30:54 +01:00
Cargo.toml	Merge remote-tracking branch 'origin/master' into check-updates	2016-12-13 17:26:09 +01:00