]> git.ipfire.org Git - thirdparty/bird.git/commitdiff
Merge commit 'v2.13.1-192-gb8312130' into thread-next
authorMaria Matejka <mq@ucw.cz>
Sun, 28 Jan 2024 13:43:05 +0000 (14:43 +0100)
committerMaria Matejka <mq@ucw.cz>
Sun, 28 Jan 2024 13:43:05 +0000 (14:43 +0100)
1  2 
conf/cf-lex.l
doc/bird.sgml

diff --cc conf/cf-lex.l
Simple merge
diff --cc doc/bird.sgml
Simple merge