registry-sync: merge everything except dns objects

This commit is contained in:
jrb0001 2018-02-24 13:17:38 +01:00
parent 921e3f1a3e
commit 9333bfdc7f
231 changed files with 1305 additions and 1590 deletions

View file

@ -1,11 +1,8 @@
inetnum: 10.128.0.0 - 10.128.63.255
netname: FFMR-DN42-IP4NET
descr: Freifunk Marburg
country: DE
org: ORG-FFMR
admin-c: FFMR-DN42
tech-c: FFMR-DN42
mnt-by: OLEANDER-MNT
status: ASSIGNED
cidr: 10.128.0.0/18
netname: ICVPN-MARBURG
bgp-status: ignored
remarks: Imported from icvpn-meta, do not edit!
remarks: File: marburg
mnt-by: DN42-MNT
source: ICVPN