]> git.ipfire.org Git - thirdparty/bird.git/commitdiff
Merge commit '9b775859' into mq-aggregator-for-v3
authorMaria Matejka <mq@ucw.cz>
Thu, 9 Nov 2023 15:00:44 +0000 (16:00 +0100)
committerMaria Matejka <mq@ucw.cz>
Thu, 9 Nov 2023 15:00:44 +0000 (16:00 +0100)
1  2 
nest/mpls.c
nest/rt-table.c

diff --cc nest/mpls.c
Simple merge
diff --cc nest/rt-table.c
Simple merge