]> 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: 718119b d6d058a)
Merge branch 'master' into core119
authorArne Fitzenreiter <arne_f@ipfire.org>
Tue, 3 Apr 2018 18:13:34 +0000 (20:13 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Tue, 3 Apr 2018 18:13:34 +0000 (20:13 +0200)

Trivial merge
IPFire 2.x development tree