]> git.ipfire.org Git - thirdparty/bird.git/commitdiff
Merge commit '80272d4b64a38ee6f04a1c4e8566cac3a2293176' into haugesund
authorMaria Matejka <mq@ucw.cz>
Mon, 30 May 2022 13:39:32 +0000 (15:39 +0200)
committerMaria Matejka <mq@ucw.cz>
Mon, 30 May 2022 13:39:32 +0000 (15:39 +0200)
1  2 
filter/f-inst.c
nest/route.h
proto/bgp/attrs.c
sysdep/linux/netlink.c

diff --cc filter/f-inst.c
Simple merge
diff --cc nest/route.h
Simple merge
Simple merge
Simple merge