]> 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: 5edc6b1 898b355)
Merge branch 'next' of git.ipfire.org:/pub/git/ipfire-2.x into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Fri, 2 Nov 2018 15:16:22 +0000 (15:16 +0000)
committerArne Fitzenreiter <arne_f@ipfire.org>
Fri, 2 Nov 2018 15:16:22 +0000 (15:16 +0000)

Trivial merge
Peter's tree of IPFire 2.x