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

5
data/person/MARLIN-DN42 Normal file
View file

@ -0,0 +1,5 @@
person: Marlin
contact: wangweimingooo@gmail.com
nic-hdl: MARLIN-DN42
mnt-by: MARLIN-MNT
source: DN42