]> git.ipfire.org Git - ipfire.org.git/commitdiff
projects / ipfire.org.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d4dc517 5a1018a)
Merge commit 'origin/next' into next
authorJan Paul Tuecking <earl@ipfire.org>
Tue, 19 Jan 2010 21:50:41 +0000 (22:50 +0100)
committerJan Paul Tuecking <earl@ipfire.org>
Tue, 19 Jan 2010 21:50:41 +0000 (22:50 +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.