Maran 474c85bc9d Fix merge conflict

2014-05-27 10:29:12 +02:00

..

assets

Fix merge conflict

2014-05-27 10:29:12 +02:00

ui

Fix merge conflict

2014-05-27 10:29:12 +02:00

config.go

Custom identifier

2014-05-22 10:38:37 +02:00

ethereum.go

Custom identifier

2014-05-22 10:38:37 +02:00

Makefile

Merge branch 'develop' of https://github.com/WeMeetAgain/go-ethereum into WeMeetAgain-develop

2014-03-22 11:32:01 +01:00