]> 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: 1ce35de a019c96)
Merge branch 'core123' of git.ipfire.org:/pub/git/ipfire-2.x into core123
authorArne Fitzenreiter <arne_f@ipfire.org>
Fri, 24 Aug 2018 18:22:05 +0000 (20:22 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Fri, 24 Aug 2018 18:22:05 +0000 (20:22 +0200)

Trivial merge
IPFire 2.x development tree