Skip to content

Commit

Permalink
Merge pull request #160 from MyBitFoundation/develop
Browse files Browse the repository at this point in the history
Merging latest changes from develop
  • Loading branch information
PeterMPhillips committed Oct 18, 2018
2 parents 9bb35f4 + 94901dd commit 951d7ee
Show file tree
Hide file tree
Showing 126 changed files with 181,012 additions and 182,822 deletions.
20 changes: 10 additions & 10 deletions accounts.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
[
"0x13c1cb47836fd4875e4fb0b44627a1ed0babf0b8",
"0xf76f915ae32ad19fd4359b0d1a56328f7beef8be",
"0x0dfb69ce3123487acdd8c6e3ab2e4ce8655b6a6c",
"0xb798b6b56024329e03b211db4c47007a3005eb68",
"0x14a89c951a59131d3e61339501f4a95cf1190efd",
"0x62bcf293e78716718bb79db862dae9ad918e0069",
"0xd72eb39df4b7d974c114f152c90c1919deed3fcc",
"0xc1334b27495bd3edba0815a2b96cab50d4abc3a1",
"0xc513d4bfd54602a931ed0ac7b160c694316e7ec8",
"0x4e8eaf8efa38c6ee6dd0fb1f11def4e6b89c3415"
"0x34b4c0cf65a762f3042070a03425ab4bffe0170c",
"0x44067107f06443e6d125352bbf95de0c133456f8",
"0x02c4039e7d59b00e20f0f1dade6265c5a27ea715",
"0x9d01aafb060b3b76dc8e546b0550b68e8d7c529b",
"0xb220118ca37c21717fd09d9fc01fbb98d9b1f930",
"0x2fd989874137f24325474df1a3aacae508e3e2ce",
"0x6925b5a5cc617e466437a39ffb9c82a56c89e0a9",
"0xe42cd23ef408bf91042f3bb643db512c36d7a42e",
"0xee3cc3822bfeb1567ded5c507eba3a9c680988e7",
"0x20a698e36ae9bce21d5a00f87a98876a0e21af4e"
]
32 changes: 16 additions & 16 deletions addresses.json
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
{
"MyBit": "0x0c57ca00b9b0f2aff3e1c5113a7c1e51287112af",
"ERC20Burner": "0xecd561c23e5c92a4d26cbd27f287e5ba473f09e9",
"Database": "0x723d5ff1e50cc8dcec5a1e2971f5094f5887b048",
"ContractManager": "0x85e0c4b687c0c618ff662b17b89673b17b462fa0",
"API": "0x73b0545e6d872b4c904079eb1d8e9cc6c8f89773",
"SingleOwned": "0x6e79eb19081f2af35f05acf824f2bc9de34fb343",
"Pausible": "0x55a76d119817552795f74d3605508d8c36297696",
"AccessHierarchy": "0x63d36c6b8f53309c93b6c53966be526aa0ebec0e",
"PlatformFunds": "0xc1aa884796ace39a79ee275f9e2e06f9a33534c2",
"Operators": "0xf8762a3c840716a208d384de93211b16bcc7492b",
"AssetManagerEscrow": "0xf2ed6113851c6a8ad781d1af4044616d8c0f8c57",
"CrowdsaleETH": "0x25ec303b7e9a8aa5f2817ddb4cf13969bf785a7e",
"CrowdsaleGeneratorETH": "0x0df14b00baeab8428e7488c37f8154281704df73",
"CrowdsaleERC20": "0x85ce610be8878cc1c18a9c7cd3188f2b012f231c",
"CrowdsaleGeneratorERC20": "0xcea1a56634b6879f2ec6592375c1b29cbe237437",
"AssetExchange": "0x311224c4cf2ac2acd4009cf72d74fca5242a0987"
"MyBit": "0x1251954ebb35a93414c4fdd6eb572f9292f79bcf",
"ERC20Burner": "0xc263fabff96e5b4a11704478816c874fda9c4177",
"Database": "0x3f4c458f7adc3ce2300cd9fa7ab2c218d04ea18d",
"ContractManager": "0x346505e54761981543be0cd304d3c123887c6e99",
"API": "0xa12d771ffb785ad139dbe082be83259b7a0da142",
"SingleOwned": "0x5bb4c507e7a64c7db50f3a398dc80f399e9c968a",
"Pausible": "0x23ecf8d2811058b790f97fe3c307c16b8e41649e",
"AccessHierarchy": "0x24d2a3416e8b073dfc557fcf0b72cd73c4ae12c1",
"PlatformFunds": "0x6bbb45d95ddbb7a015d10257f66d13936212e64d",
"Operators": "0xbc135c1965c54aca5777aa750bf7863f23e074b3",
"AssetManagerEscrow": "0x172a12d553dd2a57a4227005972340dafcfcf14d",
"CrowdsaleETH": "0xdcf1b48d5bacfd16be0d03f68e0c748e08c79fb1",
"CrowdsaleGeneratorETH": "0x0ff213559567c2787abd8fb42ff46777fe978307",
"CrowdsaleERC20": "0xd5b03029ad72aa013cbcd5a8dd31f6a5cca04f45",
"CrowdsaleGeneratorERC20": "0xa1a8c7e4c9b1cb580428f3326dec41fc1b53391f",
"AssetExchange": "0x75fcdea05c36b0bdcbf1cd341b6cb7b846a885a3"
}
10,060 changes: 5,030 additions & 5,030 deletions lib/js/API.js

Large diffs are not rendered by default.

1,922 changes: 961 additions & 961 deletions lib/js/AccessHierarchy.js

Large diffs are not rendered by default.

0 comments on commit 951d7ee

Please sign in to comment.