]> git.ipfire.org Git - ipfire-3.x.git/commitdiff
projects / ipfire-3.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 48052e1 e30ce07)
Merge remote-tracking branch 'stevee/master'
authorMichael Tremer <michael.tremer@ipfire.org>
Mon, 24 Jun 2019 12:30:24 +0000 (13:30 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Mon, 24 Jun 2019 12:30:24 +0000 (13:30 +0100)

Trivial merge
IPFire 3.x development tree