Tomasz Drwięga a7de430193 Merge branch 'master' into clippy-bump ...

Conflicts:
	dapps/Cargo.toml

2016-06-06 10:13:42 +02:00

..

src

Loading local Dapps from FS. (#1214)

2016-06-03 11:51:11 +02:00

build.rs

Renaming dapps repos. Updating dapps (#1142)

2016-05-26 18:21:15 +02:00

Cargo.toml

Merge branch 'master' into clippy-bump

2016-06-06 10:13:42 +02:00