]> 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: 8ab0203 1d7d446)
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
authorMatthias Fischer <matthias.fischer@ipfire.org>
Mon, 21 Aug 2017 17:19:15 +0000 (19:19 +0200)
committerMatthias Fischer <matthias.fischer@ipfire.org>
Mon, 21 Aug 2017 17:19:15 +0000 (19:19 +0200)

Trivial merge
Matthias' tree of IPFire 2.x