Merge branch 'master' into patch-1

This commit is contained in:
Jonathan Naylor 2019-01-03 15:54:27 +00:00 committed by GitHub
commit c96fa71681
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -53,6 +53,9 @@
# Pi-Star NXDN Reflector, 31672 # Pi-Star NXDN Reflector, 31672
31672 pi-nxdn.trianglenc.net 41500 31672 pi-nxdn.trianglenc.net 41500
# DX-LINK SYSTEM, 31777
31777 45.77.204.214 41400
# China, 46000 # China, 46000
46000 120.234.41.144 41400 46000 120.234.41.144 41400