]> git.ipfire.org Git - ipfire.org.git/commitdiff
projects / ipfire.org.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c7bcb9c 6e7822a)
Merge remote-tracking branch 'origin/master'
authorMichael Tremer <michael.tremer@ipfire.org>
Fri, 2 Nov 2018 20:18:35 +0000 (20:18 +0000)
committerMichael Tremer <michael.tremer@ipfire.org>
Fri, 2 Nov 2018 20:18:35 +0000 (20:18 +0000)
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

Trivial merge
The website of ipfire.org.