]> git.ipfire.org Git - ipfire.org.git/commitdiff
projects / ipfire.org.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6b95229 0b3fc98)
Merge commit 'earl/next' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Thu, 21 Jan 2010 15:08:36 +0000 (16:08 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Thu, 21 Jan 2010 15:08:36 +0000 (16:08 +0100)
1  2 
www/webapp/__init__.py patch | diff1 | diff2 | blob | history

diff --cc www/webapp/__init__.py
Simple merge
The website of ipfire.org.