]> git.ipfire.org Git - ipfire.org.git/commitdiff
projects / ipfire.org.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 853ae0e b8c37d4)
Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire.org
authorMichael Tremer <michael.tremer@ipfire.org>
Fri, 20 Aug 2010 17:36:26 +0000 (19:36 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Fri, 20 Aug 2010 17:36:26 +0000 (19:36 +0200)
1  2 
www/webapp/handlers.py patch | diff1 | diff2 | blob | history

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