Commit Graph

2 Commits

Author SHA1 Message Date
Jaco Greeff
9b025cf8c1 Merge branch 'master' into ui-2
# Conflicts:
#	js/src/views/ContractDevelop/store.js
2017-05-05 10:08:10 +02:00
Jaco Greeff
0c70cee503 Contracts & Contract develop as dapp 2017-04-24 13:21:22 +02:00