]> git.ipfire.org Git - thirdparty/bird.git/commitdiff
Merge commit 'cd9550b24487ac7327b0234fd825f4214fdf7b16' into haugesund
authorMaria Matejka <mq@ucw.cz>
Mon, 30 May 2022 13:38:24 +0000 (15:38 +0200)
committerMaria Matejka <mq@ucw.cz>
Mon, 30 May 2022 13:38:24 +0000 (15:38 +0200)
1  2 
filter/f-inst.c
nest/proto.c

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