]> git.ipfire.org Git - thirdparty/bird.git/commitdiff
Merge commit 'df476c2e' into thread-next
authorMaria Matejka <mq@ucw.cz>
Tue, 20 Sep 2022 11:10:29 +0000 (13:10 +0200)
committerMaria Matejka <mq@ucw.cz>
Tue, 20 Sep 2022 11:10:29 +0000 (13:10 +0200)
Implemented the corking by our own commit, merging with "ours" strategy.


Trivial merge