]> git.ipfire.org Git - people/mlorenz/ipfire-2.x.git/commitdiff
projects / people / mlorenz / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fe6f676 6ec860b)
Merge remote-tracking branch 'origin/next'
authorArne Fitzenreiter <arne_f@ipfire.org>
Sat, 23 Sep 2017 08:38:18 +0000 (10:38 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Sat, 23 Sep 2017 08:38:18 +0000 (10:38 +0200)

Trivial merge
Marcel's tree of IPFire 2.x