]> git.ipfire.org Git - thirdparty/bird.git/commitdiff
Merge commit 'v2.14-83-g1709843f' into thread-next
authorMaria Matejka <mq@ucw.cz>
Sun, 28 Jan 2024 13:56:01 +0000 (14:56 +0100)
committerMaria Matejka <mq@ucw.cz>
Sun, 28 Jan 2024 13:56:01 +0000 (14:56 +0100)
1  2 
conf/confbase.Y
nest/config.Y

diff --cc conf/confbase.Y
Simple merge
diff --cc nest/config.Y
Simple merge