Tomasz Drwięga 8b84b4f128 Merge branch 'master' into rpc-shared-miner ...

Conflicts:
	parity/main.rs

2016-04-22 12:16:15 +02:00

..

v1

Merge branch 'master' into rpc-shared-miner

2016-04-22 12:16:15 +02:00

lib.rs

Changing cors header to be optional

2016-04-14 14:38:07 +02:00