]> 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: 1d13e63 ebf64a9)
Merge branch 'master' of git.ipfire.org:/pub/git/ipfire-2.x
authorArne Fitzenreiter <arne_f@ipfire.org>
Sun, 28 May 2017 08:41:51 +0000 (10:41 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Sun, 28 May 2017 08:41:51 +0000 (10:41 +0200)

Trivial merge
IPFire 2.x development tree