]> git.ipfire.org Git - ipfire.org.git/commitdiff
projects / ipfire.org.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d933f34 7771ace)
Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire.org
authorMichael Tremer <michael.tremer@ipfire.org>
Sun, 21 Oct 2012 18:05:27 +0000 (20:05 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Sun, 21 Oct 2012 18:05:27 +0000 (20:05 +0200)
1  2 
www/webapp/__init__.py patch | diff1 | diff2 | blob | history
www/webapp/handlers_download.py patch | diff1 | diff2 | blob | history

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