]> 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: 46b4573 8b62663)
Merge branch 'next' of git.ipfire.org:/pub/git/ipfire-2.x into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Tue, 3 Sep 2019 11:33:06 +0000 (11:33 +0000)
committerArne Fitzenreiter <arne_f@ipfire.org>
Tue, 3 Sep 2019 11:33:06 +0000 (11:33 +0000)

Trivial merge
Matthias' tree of IPFire 2.x