]> 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: 984a6ca 16e1326)
Merge branch 'master' into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Wed, 22 May 2019 10:34:41 +0000 (12:34 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Wed, 22 May 2019 10:34:41 +0000 (12:34 +0200)

Trivial merge
Matthias' tree of IPFire 2.x