]> git.ipfire.org Git - people/stevee/ipfire-2.x.git/commitdiff
projects / people / stevee / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2d58ea3 be60bc8)
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
authorStefan Schantl <stefan.schantl@ipfire.org>
Sat, 10 Aug 2019 14:19:48 +0000 (16:19 +0200)
committerStefan Schantl <stefan.schantl@ipfire.org>
Sat, 10 Aug 2019 14:19:48 +0000 (16:19 +0200)

Trivial merge
Stefan's tree of IPFire 2.x.