mempool/mining-pools
mempool/mining-pools
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into add-bitfury-pool

Browse Source 
Conflicts:
	pools.json
This commit is contained in:
James Hilliard 2015-04-28 10:27:41 -04:00
commit aa501cae03
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pools.json
View File

@ -175,6 +175,10 @@
"/BitFury/" : {
"name" : "BitFury",
"link" : "http://bitfury.com/"
},
"/agentD/" : {
"name" : "digitalBTC",
"link" : "http://db.high.re:8080/"
}
},
"payout_addresses" : {
@ -207,8 +211,8 @@
"link" : "https://eclipsemc.com/"
},
"1BwZeHJo7b7M2op7VDfYnsmcpXsUYEcVHm" : {
"name" : "Unknown with 1BwZeHJ Address",
"link" : ""
"name" : "BTC Nuggets",
"link" : "http://104.197.8.250/"
},
"1KFHE7w8BhaENAswwryaoccDb6qcT6DbYY" : {
"name" : "F2Pool",
@ -241,6 +245,10 @@
"14yfxkcpHnju97pecpM7fjuTkVdtbkcfE6" : {
"name" : "BitFury",
"link" : "http://bitfury.com/"
},
"1MimPd6LrPKGftPRHWdfk8S3KYBfN4ELnD" : {
"name" : "digitalBTC",
"link" : "http://db.high.re:8080/"
}
}
}