mirror of
https://git.proxmox.com/git/mirror_frr
synced 2025-08-03 02:22:48 +00:00
Merge branch 'stable/3.0' into tmp-3.0-master-merge
Marker (--strategy=ours) merge to record which point in history master is in sync with related to stable/3.0. Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
This commit is contained in:
commit
0e236c6cd7