Merge commit '54ddf90f'

author Maria Matejka <mq@ucw.cz>

Fri, 8 Dec 2023 07:30:30 +0000 (08:30 +0100)

committer Maria Matejka <mq@ucw.cz>

Fri, 8 Dec 2023 07:30:30 +0000 (08:30 +0100)
author Maria Matejka <mq@ucw.cz>
Fri, 8 Dec 2023 07:30:30 +0000 (08:30 +0100)
committer Maria Matejka <mq@ucw.cz>
Fri, 8 Dec 2023 07:30:30 +0000 (08:30 +0100)
diff --cc doc/bird.sgml
Simple merge
diff --cc nest/config.Y
Simple merge
diff --cc nest/route.h
Simple merge
diff --cc nest/rt-table.c
Simple merge
author	Maria Matejka <mq@ucw.cz>
	Fri, 8 Dec 2023 07:30:30 +0000 (08:30 +0100)
committer	Maria Matejka <mq@ucw.cz>
	Fri, 8 Dec 2023 07:30:30 +0000 (08:30 +0100)
		1	2
doc/bird.sgml	patch \|	diff1 \|	diff2 \|	blob \| history
nest/config.Y	patch \|	diff1 \|	diff2 \|	blob \| history
nest/route.h	patch \|	diff1 \|	diff2 \|	blob \| history
nest/rt-table.c	patch \|	diff1 \|	diff2 \|	blob \| history