]> git.ipfire.org Git - ipfire.org.git/commit - www/static/images/screenshots/en/system-information-1.png
Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire.org
authorMichael Tremer <michael.tremer@ipfire.org>
Sun, 15 Jul 2012 09:30:48 +0000 (11:30 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Sun, 15 Jul 2012 09:30:48 +0000 (11:30 +0200)
commit4bda7014352a0cde56a64765ea9daa63c6aee889
tree7fb70f11a2450a657b8b0dec8a90bdfe47a3d095
parentce6c2902738219afc8674cf77cac13f9ceaeae6f
parenta3ee39ce0671611de5fb4a55726960239db2065c
Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire.org

Conflicts:
www/webapp/backend/mirrors.py
www/webapp/backend/mirrors.py
www/webapp/ui_modules.py