]> git.ipfire.org Git - ipfire-2.x.git/commitdiff
projects / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f7d76ee 702f0ba)
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
authorStefan Schantl <stefan.schantl@ipfire.org>
Thu, 23 Aug 2018 08:32:21 +0000 (10:32 +0200)
committerStefan Schantl <stefan.schantl@ipfire.org>
Thu, 23 Aug 2018 08:32:21 +0000 (10:32 +0200)

Trivial merge
IPFire 2.x development tree