]> 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: 6af8fa9 83d6101)
Merge remote-tracking branch 'origin/next'
authorMichael Tremer <michael.tremer@ipfire.org>
Wed, 21 Feb 2018 12:06:21 +0000 (12:06 +0000)
committerMichael Tremer <michael.tremer@ipfire.org>
Wed, 21 Feb 2018 12:06:21 +0000 (12:06 +0000)

Trivial merge
Peter's tree of IPFire 2.x