]> git.ipfire.org Git - people/pmueller/ipfire-2.x.git/commitdiff
projects / people / pmueller / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 46b3073 0a5823d)
Merge remote-tracking branch 'origin/master' into core124
authorArne Fitzenreiter <arne_f@ipfire.org>
Wed, 26 Sep 2018 12:09:57 +0000 (14:09 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Wed, 26 Sep 2018 12:09:57 +0000 (14:09 +0200)

Trivial merge
Peter's tree of IPFire 2.x