]> git.ipfire.org Git - thirdparty/bird.git/commitdiff
projects / thirdparty / bird.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7781003 33f7fbc)
Merge branch 'master' into int-new
authorOndrej Zajicek (work) <santiago@crfreenet.org>
Wed, 31 May 2017 12:12:03 +0000 (14:12 +0200)
committerOndrej Zajicek (work) <santiago@crfreenet.org>
Wed, 31 May 2017 12:12:03 +0000 (14:12 +0200)
1  2 
nest/cli.c patch | diff1 | diff2 | blob | history

diff --cc nest/cli.c
Simple merge
Mirror of https://gitlab.labs.nic.cz/labs/bird.git