]> git.ipfire.org Git - ipfire.org.git/commit
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)
commit9e0af8a41c79252342943f22ad7a8b8b12aa6773
treec61a2fc8b667df26d378d506f48823421cca1c1a
parentf4add822b47872169bb706f6121f9466873028fc
parent20813528ae5a769a69f3ff20283a9a05bd8dd7a7
Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire.org
webapp/backend/fireinfo.py