Skip to content

Commit

Permalink
Merge branch 'master' of github.com:233boy/v2ray
Browse files Browse the repository at this point in the history
  • Loading branch information
233boy committed Mar 24, 2020
2 parents ed619a6 + 929e9d4 commit 96c4be3
Show file tree
Hide file tree
Showing 11 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion config/server/dynamic/http.json
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@
],
"dns": {
"servers": [
"https+local://1.1.1.1/dns-query",
"https+local://cloudflare-dns.com/dns-query",
"1.1.1.1",
"1.0.0.1",
"8.8.8.8",
Expand Down
2 changes: 1 addition & 1 deletion config/server/dynamic/kcp.json
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@
],
"dns": {
"servers": [
"https+local://1.1.1.1/dns-query",
"https+local://cloudflare-dns.com/dns-query",
"1.1.1.1",
"1.0.0.1",
"8.8.8.8",
Expand Down
2 changes: 1 addition & 1 deletion config/server/dynamic/quic.json
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@
],
"dns": {
"servers": [
"https+local://1.1.1.1/dns-query",
"https+local://cloudflare-dns.com/dns-query",
"1.1.1.1",
"1.0.0.1",
"8.8.8.8",
Expand Down
2 changes: 1 addition & 1 deletion config/server/dynamic/tcp.json
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@
],
"dns": {
"servers": [
"https+local://1.1.1.1/dns-query",
"https+local://cloudflare-dns.com/dns-query",
"1.1.1.1",
"1.0.0.1",
"8.8.8.8",
Expand Down
2 changes: 1 addition & 1 deletion config/server/dynamic/ws.json
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@
],
"dns": {
"servers": [
"https+local://1.1.1.1/dns-query",
"https+local://cloudflare-dns.com/dns-query",
"1.1.1.1",
"1.0.0.1",
"8.8.8.8",
Expand Down
2 changes: 1 addition & 1 deletion config/server/h2.json
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
],
"dns": {
"servers": [
"https+local://1.1.1.1/dns-query",
"https+local://cloudflare-dns.com/dns-query",
"1.1.1.1",
"1.0.0.1",
"8.8.8.8",
Expand Down
2 changes: 1 addition & 1 deletion config/server/http.json
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@
],
"dns": {
"servers": [
"https+local://1.1.1.1/dns-query",
"https+local://cloudflare-dns.com/dns-query",
"1.1.1.1",
"1.0.0.1",
"8.8.8.8",
Expand Down
2 changes: 1 addition & 1 deletion config/server/kcp.json
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
],
"dns": {
"servers": [
"https+local://1.1.1.1/dns-query",
"https+local://cloudflare-dns.com/dns-query",
"1.1.1.1",
"1.0.0.1",
"8.8.8.8",
Expand Down
2 changes: 1 addition & 1 deletion config/server/quic.json
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
],
"dns": {
"servers": [
"https+local://1.1.1.1/dns-query",
"https+local://cloudflare-dns.com/dns-query",
"1.1.1.1",
"1.0.0.1",
"8.8.8.8",
Expand Down
2 changes: 1 addition & 1 deletion config/server/tcp.json
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
],
"dns": {
"servers": [
"https+local://1.1.1.1/dns-query",
"https+local://cloudflare-dns.com/dns-query",
"1.1.1.1",
"1.0.0.1",
"8.8.8.8",
Expand Down
2 changes: 1 addition & 1 deletion config/server/ws.json
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
],
"dns": {
"servers": [
"https+local://1.1.1.1/dns-query",
"https+local://cloudflare-dns.com/dns-query",
"1.1.1.1",
"1.0.0.1",
"8.8.8.8",
Expand Down

0 comments on commit 96c4be3

Please sign in to comment.