]> git.ipfire.org Git - thirdparty/bird.git/commitdiff
projects / thirdparty / bird.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 94a95a6 41d6002)
Merge commit 'v2.14-30-g41d6002f' into mq-merge-step-2
authorMaria Matejka <mq@ucw.cz>
Sun, 28 Jan 2024 13:55:50 +0000 (14:55 +0100)
committerMaria Matejka <mq@ucw.cz>
Sun, 28 Jan 2024 13:55:50 +0000 (14:55 +0100)
1  2 
conf/confbase.Y patch | diff1 | diff2 | blob | history

diff --cc conf/confbase.Y
Simple merge
Mirror of https://gitlab.labs.nic.cz/labs/bird.git