]> 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: eca0e5d f6c97e0)
Merge remote-tracking branch 'origin/next'
authorArne Fitzenreiter <arne_f@ipfire.org>
Mon, 29 Jan 2018 18:46:30 +0000 (19:46 +0100)
committerArne Fitzenreiter <arne_f@ipfire.org>
Mon, 29 Jan 2018 18:46:30 +0000 (19:46 +0100)

Trivial merge
IPFire 2.x development tree