]> git.ipfire.org Git - ipfire.org.git/commitdiff
projects / ipfire.org.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 60024cc 626a896)
Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire.org
authorMichael Tremer <michael.tremer@ipfire.org>
Sun, 15 Jul 2012 09:19:29 +0000 (11:19 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Sun, 15 Jul 2012 09:19:29 +0000 (11:19 +0200)
Conflicts:
www/templates/stasy-profile-detail.html


Trivial merge
The website of ipfire.org.