]> 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: 3de55e1 f7eab09)
Merge remote-tracking branch 'origin/master' into core111
authorArne Fitzenreiter <arne_f@ipfire.org>
Fri, 9 Jun 2017 19:41:19 +0000 (21:41 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Fri, 9 Jun 2017 19:41:19 +0000 (21:41 +0200)

Trivial merge
IPFire 2.x development tree