Jaco Greeff 2588aea6b2 Merge branch 'master' into check-updates		2016-12-14 14:37:38 +01:00
..
config.full.toml	Fix tests.	2016-12-11 15:41:49 +01:00
config.invalid1.toml
config.invalid2.toml
config.invalid3.toml
config.toml
mod.rs	Rename ethcore -> parity in license.	2016-12-11 19:30:54 +01:00
usage.rs	Rename ethcore -> parity in license.	2016-12-11 19:30:54 +01:00
usage.txt	Merge branch 'master' into check-updates	2016-12-14 14:37:38 +01:00
version.txt