]> 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: 23a3aec f354601)
Merge branch 'next' of git.ipfire.org:/pub/git/ipfire-2.x into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Fri, 7 Dec 2018 20:06:45 +0000 (21:06 +0100)
committerArne Fitzenreiter <arne_f@ipfire.org>
Fri, 7 Dec 2018 20:06:45 +0000 (21:06 +0100)

Trivial merge
Peter's tree of IPFire 2.x