]> 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: 00ac957 0da2f15)
Merge commit '0da2f155fdfa9b060840e9d7ee6229577cb52162' core118 v2.19-core118
authorArne Fitzenreiter <arne_f@ipfire.org>
Thu, 8 Feb 2018 17:14:31 +0000 (18:14 +0100)
committerArne Fitzenreiter <arne_f@ipfire.org>
Thu, 8 Feb 2018 17:15:01 +0000 (18:15 +0100)
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>

Trivial merge
IPFire 2.x development tree