Merge branch 'master' of marlin/mydn42 into master

This commit is contained in:
burble 2020-06-17 18:31:54 +00:00 committed by kapha wiki
commit fbaa6f5793
7 changed files with 47 additions and 0 deletions

View file

@ -0,0 +1,10 @@
inet6num: fdef:6fb6:592d:0000:0000:0000:0000:0000 - fdef:6fb6:592d:ffff:ffff:ffff:ffff:ffff
cidr: fdef:6fb6:592d::/48
netname: MARLIN-NETWORK
descr: Network of MARLIN
country: CN
admin-c: MARLIN-DN42
tech-c: MARLIN-DN42
mnt-by: MARLIN-MNT
status: ASSIGNED
source: DN42