Skip to content

Commit

Permalink
Merge branch 'master' into add-whitelist-address-in-manage-#596
Browse files Browse the repository at this point in the history
  • Loading branch information
fernandomg committed Mar 13, 2018
2 parents b7ca648 + ffa90d6 commit 64724f9
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ __Deploying on POA's Sokol or Main network is much faster then using Ethereum's
- [Strategy](https://github.com/poanetwork/token-wizard/wiki/Token-Wizard-Strategy)
- [How to run](https://github.com/poanetwork/token-wizard/wiki/Token-Wizard-How-to-run)
- [Using POA Networks](https://github.com/poanetwork/token-wizard/wiki/Connecting-to-POA-Networks)
- [Deployment Time & Gas](https://github.com/poanetwork/token-wizard/wiki/Token-Wizard-Deployment-Stats)
- [Deployment Time & Gas](https://github.com/poanetwork/token-wizard/wiki/Token-Wizard-Deployment-Time-and-Gas)
- [Verifying Smart-Contracts](https://github.com/poanetwork/token-wizard/wiki/Token-Wizard-Verifying-Contracts)
- [Projects on Token Wizard](https://github.com/poanetwork/token-wizard/wiki/Token-Wizard-Projects)
- [Notable Contributors](https://github.com/poanetwork/token-wizard/wiki/Token-Wizard-Notable-Contributors)
Expand Down
2 changes: 1 addition & 1 deletion submodules/token-wizard-test-automation
Submodule token-wizard-test-automation updated 57 files
+0 −37 .circleci/config.yml
+4 −1 .gitignore
+294 −270 .idea/workspace.xml
+0 −1 Googleauth.txt
+0 −90 bin/www
+1 −1 entity/Logger.js
+12 −12 entity/User.js
+8 −1 index.js
+1 −0 pages/ManagePage.js
+12 −10 pages/MetaMask.js
+21 −20 pages/Page.js
+22 −12 pages/TierPage.js
+5 −2 pages/WizardStep3.js
+11 −4 scenarios/testSuite11.json
+9 −3 scenarios/testSuite12.json
+41 −0 scenarios/testSuite13.json
+41 −0 scenarios/testSuite14.json
+41 −0 scenarios/testSuite15.json
+41 −0 scenarios/testSuite16.json
+41 −0 scenarios/testSuite17.json
+41 −0 scenarios/testSuite18.json
+41 −0 scenarios/testSuite19.json
+41 −0 scenarios/testSuite20.json
+132 −41 test/testSuite1.js
+3 −2 test/testSuite2.js
+19 −0 token.txt
+0 −0 users/user4_0e03.json
+0 −0 users/user4_4082.json
+0 −0 users/user4_40cA.json
+0 −0 users/user4_F16A.json
+5 −0 users/user77_020F.json
+5 −0 users/user77_0436.json
+5 −0 users/user77_1180.json
+0 −0 users/user77_27F2.json
+5 −0 users/user77_2a77.json
+5 −0 users/user77_3402.json
+0 −0 users/user77_45D9.json
+5 −0 users/user77_4754.json
+5 −0 users/user77_4B33.json
+0 −0 users/user77_56B2.json
+5 −0 users/user77_5860.json
+5 −0 users/user77_5ACC.json
+5 −0 users/user77_76b3.json
+0 −0 users/user77_783C.json
+0 −0 users/user77_895B.json
+5 −0 users/user77_8ce1.json
+5 −0 users/user77_944A.json
+0 −0 users/user77_9E96.json
+0 −0 users/user77_A5ec.json
+0 −0 users/user77_A6C8.json
+5 −0 users/user77_C0FD.json
+5 −0 users/user77_CcDD.json
+5 −0 users/user77_Db0E.json
+0 −0 users/user77_c30b.json
+0 −0 users/user77_ecDF.json
+5 −0 users/user77_f5aA.json
+26 −7 utils/Utils.js

0 comments on commit 64724f9

Please sign in to comment.