Skip to content

Commit

Permalink
Merge pull request #109 from PolymathNetwork/release-1.1.0
Browse files Browse the repository at this point in the history
Release 1.1.0
  • Loading branch information
pabloruiz55 authored May 18, 2018
2 parents bdb2899 + 006fd88 commit 010ac66
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .npmignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.npm-debug.log
*.DS_Store
demo

coverage
4 changes: 2 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# Changelog
All notable changes to this project will be documented in this file.

## [Unreleased](https://github.com/PolymathNetwork/polymath-core/compare/npm-publish-2...master)
## [Unreleased](https://github.com/PolymathNetwork/polymath-core/compare/release-1.1.0...master)

[__1.0.1__](https://www.npmjs.com/package/polymath-core?activeTab=readme) __17-04-18__
[__1.1.0__](https://www.npmjs.com/package/polymath-core?activeTab=readme) __18-05-18__

## Changed

Expand Down
2 changes: 1 addition & 1 deletion migrations/2_deploy_contracts.js
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ module.exports = function (deployer, network, accounts) {
} else if (network === 'kovan') {
web3 = new Web3(new Web3.providers.HttpProvider('https://kovan.infura.io/g5xfoQ0jFSE9S5LwM1Ei'))
PolymathAccount = accounts[0]
PolyToken = '0x455Da7D06862Fa7d7639473F287f88bc7b35FF7F' // PolyToken Ropsten Faucet Address
PolyToken = '0x455Da7D06862Fa7d7639473F287f88bc7b35FF7F' // PolyToken Kovan Faucet Address
} else if (network === 'mainnet') {
web3 = new Web3(new Web3.providers.HttpProvider('https://mainnet.infura.io/g5xfoQ0jFSE9S5LwM1Ei'))
PolyToken = '0x9992eC3cF6A55b00978cdDF2b27BC6882d88D1eC' // Mainnet PolyToken Address
Expand Down
2 changes: 1 addition & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "polymath-core",
"version": "1.0.0",
"version": "1.1.0",
"description": "Polymath Network Core Smart Contracts",
"main": "truffle.js",
"directories": {
Expand Down

0 comments on commit 010ac66

Please sign in to comment.