Tchadel Icard 83e20f1260 Fixe merging issues

2018-11-14 23:03:18 +01:00

..

as-block

…

as-set

ZHAOFENG-AS: Add routing policies

2018-11-13 22:55:19 -08:00

aut-num

Merge branch 'routing-policies' of zhaofengli/registry into master

2018-11-14 18:39:54 +00:00

dns

Remove status attribute from dns/domain objects

2018-11-13 21:17:39 +01:00

inet6num

Rename ALEXSHPILKIN-MNT to LOINTAIN-MNT

2018-11-13 23:25:22 +03:00

inetnum

Allocate 172.23.57.0/28 to LOINTAIN

2018-11-13 23:40:54 +03:00

key-cert

Implement needed files for ZYRA-NETWORK. Commit includes AS, IPv6,

2018-11-01 18:36:45 -05:00

mntner

Fixe merging issues

2018-11-14 23:03:18 +01:00

organisation

…

person

Fixe merging issues

2018-11-14 23:03:18 +01:00

registry

…

role

…

route

Allocate 172.23.57.0/28 to LOINTAIN

2018-11-13 23:40:54 +03:00

route6

Rename ALEXSHPILKIN-MNT to LOINTAIN-MNT

2018-11-13 23:25:22 +03:00

route-set

…

schema

Merge branch 'inetnum-policy' of dn42/registry into master

2018-11-13 20:36:11 +00:00

tinc-key

…

tinc-keyset

…

filter6.txt

…

filter.txt

…