]> git.ipfire.org Git - ipfire.org.git/commitdiff
projects / ipfire.org.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e1f5c9a ed71cc8)
Merge branch 'master' of /srv/git/ipfire.org
authorMichael Tremer <michael.tremer@ipfire.org>
Mon, 13 Oct 2008 16:22:06 +0000 (18:22 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Mon, 13 Oct 2008 16:22:06 +0000 (18:22 +0200)
Conflicts:

www/de/downloads.shtml
www/en/downloads.shtml

nothing added to commit but untracked files present (use "git add" to track)


Trivial merge
The website of ipfire.org.