]> git.ipfire.org Git - people/mfischer/ipfire-2.x.git/commitdiff
projects / people / mfischer / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ec516f0 e7fe1ad)
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
authorMatthias Fischer <matthias.fischer@ipfire.org>
Tue, 9 Jan 2018 22:37:34 +0000 (23:37 +0100)
committerMatthias Fischer <matthias.fischer@ipfire.org>
Tue, 9 Jan 2018 22:37:34 +0000 (23:37 +0100)

Trivial merge
Matthias' tree of IPFire 2.x