]> 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: 09f518f be3d395)
Merge remote-tracking branch 'origin/master' into core110
authorArne Fitzenreiter <arne_f@ipfire.org>
Tue, 4 Apr 2017 19:32:28 +0000 (21:32 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Tue, 4 Apr 2017 19:32:28 +0000 (21:32 +0200)

Trivial merge
IPFire 2.x development tree