]> 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: 95ae21d 4238ef8)
Merge branch 'master' of git://git.ipfire.org/ipfire.org
authorMichael Tremer <michael.tremer@ipfire.org>
Sun, 1 Mar 2015 22:11:09 +0000 (23:11 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Sun, 1 Mar 2015 22:11:09 +0000 (23:11 +0100)
1  2 
webapp/backend/fireinfo.py patch | diff1 | diff2 | blob | history

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