From: Maria Matejka Date: Tue, 20 Sep 2022 07:52:03 +0000 (+0200) Subject: Merge commit '0fd1c1d0' into thread-next X-Git-Tag: v3.0-alpha1~123 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5d7b2676a1e64b624c3996d1148b2f43d0c19995;p=thirdparty%2Fbird.git Merge commit '0fd1c1d0' into thread-next Using the "ours" strategy as the changes introduced in merged commits are already implemented in thread-next in a different way. --- 5d7b2676a1e64b624c3996d1148b2f43d0c19995