]> 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: 9d5d057 396ff12)
Merge remote-tracking branch 'origin/next'
authorArne Fitzenreiter <arne_f@ipfire.org>
Tue, 12 Dec 2017 20:33:10 +0000 (21:33 +0100)
committerArne Fitzenreiter <arne_f@ipfire.org>
Tue, 12 Dec 2017 20:33:10 +0000 (21:33 +0100)

Trivial merge
IPFire 2.x development tree