]> 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: 78e0d8b 8e68bb8)
Merge branch 'core124' of git.ipfire.org:/pub/git/ipfire-2.x into core125
authorArne Fitzenreiter <arne_f@ipfire.org>
Sun, 11 Nov 2018 16:07:15 +0000 (17:07 +0100)
committerArne Fitzenreiter <arne_f@ipfire.org>
Sun, 11 Nov 2018 16:07:15 +0000 (17:07 +0100)

Trivial merge
IPFire 2.x development tree