Merge branch 'develop' into 'markup'
# Conflicts: # ui/public/index.html
Showing
- .gitignore 1 addition, 0 deletions.gitignore
- README.md 38 additions, 19 deletionsREADME.md
- api/README.md 27 additions, 0 deletionsapi/README.md
- api/abi.json 187 additions, 0 deletionsapi/abi.json
- api/src/StamperWrapper.js 38 additions, 10 deletionsapi/src/StamperWrapper.js
- api/src/index.js 38 additions, 32 deletionsapi/src/index.js
- contract/.gitignore 1 addition, 0 deletionscontract/.gitignore
- contract/README.md 46 additions, 0 deletionscontract/README.md
- contract/migrations/1_initial_migration.js 1 addition, 1 deletioncontract/migrations/1_initial_migration.js
- contract/migrations/2_stamper.js 1 addition, 2 deletionscontract/migrations/2_stamper.js
- contract/package-lock.json 2675 additions, 0 deletionscontract/package-lock.json
- contract/package.json 11 additions, 0 deletionscontract/package.json
- contract/truffle-config.js 18 additions, 1 deletioncontract/truffle-config.js
.gitignore
0 → 100644
api/README.md
0 → 100644
api/abi.json
0 → 100644
contract/README.md
0 → 100644
contract/package-lock.json
0 → 100644
This diff is collapsed.
contract/package.json
0 → 100644
Please register or sign in to comment