Merge branch 'patch-2' of https://github.com/iPerky/muse into iPerky-patch-2

Conflicts:
	libraries/app/application.cpp
This commit is contained in:
abitmore 2016-10-14 00:13:23 +08:00
commit 82cf1a10af

View file

@ -176,8 +176,7 @@ namespace detail {
"104.236.144.84:1777", // puppies
"40.127.190.171:1777", // betax
"185.25.22.21:1776", // liondani (greece)
"212.47.249.84:50696", // iHashFury (France)
"104.168.154.160:50696", // iHashFury (USA)
"212.47.249.84:50696", // iHashFury
"128.199.143.47:2015", // Harvey
"seed.roelandp.nl:1776" // @roelandp (canada)
};