Merge branch 'dev' of https://git.coding.net/virusdefender/qduoj

Conflicts: contest/views.py
2015-09-17 13:25:38 +08:00
parent 03e64ad08d 34e5ccb993
commit 6a40e88178
8 changed files with 25 additions and 49 deletions
--- a/static/src/css/global.css
+++ b/static/src/css/global.css
@@ -41,4 +41,5 @@ label {

 pre {
    font-family: "Consolas", "Bitstream Vera Sans Mono", "Courier New", Courier, monospace;
+    background-color: white;
 }