Simon Marsh 81b6fdf2c9 Manual merge of git.dn42.us:Wenjie_Zhou/registry (pull request #1441) to fix merge conflicts

2020-04-17 12:11:46 +01:00

..

as-block

…

as-set

…

aut-num

Manual merge of git.dn42.us:Wenjie_Zhou/registry (pull request #1441) to fix merge conflicts

2020-04-17 12:11:46 +01:00

dns

Requesting caesia.dn42 for CAESIA by INRIN

2020-04-17 02:18:23 +02:00

inet6num

Manual merge of git.dn42.us:Wenjie_Zhou/registry (pull request #1441) to fix merge conflicts

2020-04-17 12:11:46 +01:00

inetnum

Manual merge of git.dn42.us:Wenjie_Zhou/registry (pull request #1441) to fix merge conflicts

2020-04-17 12:11:46 +01:00

key-cert

…

mntner

Manual merge of git.dn42.us:Wenjie_Zhou/registry (pull request #1441) to fix merge conflicts

2020-04-17 12:11:46 +01:00

organisation

HITLUG Join as AS4242420985

2020-04-15 02:46:10 +08:00

person

Manual merge of git.dn42.us:Wenjie_Zhou/registry (pull request #1441) to fix merge conflicts

2020-04-17 12:11:46 +01:00

registry

…

role

…

route

Manual merge of git.dn42.us:Wenjie_Zhou/registry (pull request #1441) to fix merge conflicts

2020-04-17 12:11:46 +01:00

route6

Manual merge of git.dn42.us:Wenjie_Zhou/registry (pull request #1441) to fix merge conflicts

2020-04-17 12:11:46 +01:00

route-set

…

schema

…

tinc-key

…

filter6.txt

…

filter.txt

…