]> git.ipfire.org Git - people/shoehn/ipfire.org.git/commitdiff
projects / people / shoehn / ipfire.org.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: cef37a4 8876f3d)
Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire.org
authorMichael Tremer <michael.tremer@ipfire.org>
Sat, 4 May 2013 17:25:24 +0000 (18:25 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Sat, 4 May 2013 17:25:24 +0000 (18:25 +0100)
1  2 
webapp/__init__.py patch | diff1 | diff2 | blob | history

diff --cc webapp/__init__.py
Simple merge
Sven's copy of the ipfire.org website