Merge branch 'master' into rotating-key

Conflicts: rpc/src/v1/traits/signer.rs
2016-12-14 14:10:44 +01:00
parent c408861c29 1a9a142a69
commit 7eb9112613
1555 changed files with 7591 additions and 4331 deletions
--- a/ethstore/tests/util/mod.rs
+++ b/ethstore/tests/util/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.

 // Parity is free software: you can redistribute it and/or modify
--- a/ethstore/tests/util/transient_dir.rs
+++ b/ethstore/tests/util/transient_dir.rs
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
 // This file is part of Parity.

 // Parity is free software: you can redistribute it and/or modify