]> git.ipfire.org Git - people/shoehn/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 22:01:32 +0000 (23:01 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Tue, 17 Mar 2015 22:01:32 +0000 (23:01 +0100)
commit2ef236b837c7212eb97be4d4304d8f9f85daa061
treef69422850f30303c8a4fa25eecc1da3b05665087
parente46e8df8f5f80d1ebf546ff58c20a2ec262f94c3
parente04a728a7c018c650e8c9a8815d80b4a50055c2d
Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire.org

Conflicts:
webapp/ui_modules.py
webapp/ui_modules.py