]> git.ipfire.org Git - people/pmueller/ipfire-2.x.git/commitdiff
projects / people / pmueller / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3a8fef3 0dd16f4)
Merge remote-tracking branch 'origin/master' into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Thu, 20 Jun 2019 07:35:59 +0000 (09:35 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Thu, 20 Jun 2019 07:35:59 +0000 (09:35 +0200)

Trivial merge
Peter's tree of IPFire 2.x