]> 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: 82d25ba 5ba5f8c)
Merge branch 'core110'
authorArne Fitzenreiter <arne_f@ipfire.org>
Tue, 30 May 2017 19:29:20 +0000 (21:29 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Tue, 30 May 2017 19:29:20 +0000 (21:29 +0200)

Trivial merge
Peter's tree of IPFire 2.x