Merge branch 'master' into add-telco214-pool

Conflicts: pools.json
2015-06-09 02:53:14 -06:00 · 2015-06-09 02:53:14 -06:00 · ebc7de7ed4
commit ebc7de7ed4
parent b0b032fcf8 89dfedff37
1 changed files with 8 additions and 0 deletions
--- a/pools.json
+++ b/pools.json
@ -164,6 +164,10 @@
            "name" : "BTCChina Pool",
            "link" : "https://pool.btcchina.com/"
        },
+        "btcchina.com" : {
+            "name" : "BTCChina Pool",
+            "link" : "https://pool.btcchina.com/"
+        },
        "BW Pool" : {
            "name" : "BW.COM",
            "link" : "https://bw.com/"
@ -253,6 +257,10 @@
        "1GaKSh2t396nfSg5Ku2J3Yn1vfVsXrGuH5" : {
            "name" : "Telco 214",
            "link" : "http://66.194.38.254:8081/"
+        },
+        "152f1muMCNa7goXYhYAQC61hxEgGacmncB" : {
+            "name" : "BTCChina Pool",
+            "link" : "https://pool.btcchina.com/"
        }
    }
 }