]> git.ipfire.org Git - ipfire.org.git/commitdiff
projects / ipfire.org.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f4add82 2081352)
Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire.org
authorMichael Tremer <michael.tremer@ipfire.org>
Tue, 17 Mar 2015 13:15:33 +0000 (14:15 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Tue, 17 Mar 2015 13:15:33 +0000 (14:15 +0100)
1  2 
webapp/backend/fireinfo.py patch | diff1 | diff2 | blob | history

diff --cc webapp/backend/fireinfo.py
Simple merge
The website of ipfire.org.