Игорь Соболев db812c1f0c Merge remote-tracking branch 'origin/new_proofs' into fusking-truffle ...

# Conflicts:
#	truffle/migrations/2_deploy_lazy.js

2019-07-01 13:50:43 +03:00

..

1_initial_migration.js

Fixed initial html

2019-06-23 16:36:30 +03:00

2_deploy_lazy.js

Merge remote-tracking branch 'origin/new_proofs' into fusking-truffle

2019-07-01 13:50:43 +03:00