]> git.ipfire.org Git - people/ms/network.git/commitdiff
projects / people / ms / network.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 38b2f8e 43433a8)
Merge remote-tracking branch 'upstream/master'
authorJonatan Schlag <jonatan.schlag@ipfire.org>
Sat, 15 Sep 2018 22:14:36 +0000 (00:14 +0200)
committerJonatan Schlag <jonatan.schlag@ipfire.org>
Sat, 15 Sep 2018 22:14:36 +0000 (00:14 +0200)

Trivial merge
Networking code of IPFire 3.x.