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
..
benches	Rename ethcore -> parity in license.	2016-12-11 19:30:54 +01:00
bigint	Crate tidyups.	2016-12-11 19:14:42 +01:00
bloom	Crate tidyups.	2016-12-11 19:14:42 +01:00
fetch	authors & homepage => Parity	2016-12-11 19:43:58 +01:00
https-fetch	authors & homepage => Parity	2016-12-11 19:43:58 +01:00
io	Merge branch 'master' into auth-bft	2016-12-12 21:28:46 +01:00
network	Merge pull request #3796 from ethcore/tx-broadcast	2016-12-12 04:13:56 +01:00
rlp	authors & homepage => Parity	2016-12-11 19:43:58 +01:00
sha3	authors & homepage => Parity	2016-12-11 19:43:58 +01:00
src	Make updater an IPC module.	2016-12-11 22:47:43 +01:00
table	authors & homepage => Parity	2016-12-11 19:43:58 +01:00
using_queue	authors & homepage => Parity	2016-12-11 19:43:58 +01:00
build.rs	Rename ethcore -> parity in license.	2016-12-11 19:30:54 +01:00
Cargo.toml	Make updater an IPC module.	2016-12-11 22:47:43 +01:00
cov.sh	remove redundant modification	2016-03-02 13:02:33 +03:00
Makefile	Move ethcore files back into root.	2016-01-17 13:11:25 +01:00