]> 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: 5776b67 bc91a66)
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
authorStefan Schantl <stefan.schantl@ipfire.org>
Wed, 27 Jun 2018 17:33:43 +0000 (19:33 +0200)
committerStefan Schantl <stefan.schantl@ipfire.org>
Wed, 27 Jun 2018 17:33:43 +0000 (19:33 +0200)

Trivial merge
Peter's tree of IPFire 2.x