Merge branch 'dev' into hohoTT-dev

2015-09-14 11:28:57 +08:00
parent fcb0a3b2a6 4cf618796b
commit bfa2029f2a
40 changed files with 931 additions and 2834 deletions
--- a/oj/local_settings.py
+++ b/oj/local_settings.py
@@ -34,7 +34,7 @@ REDIS_CACHE = {
 DEBUG = True

 # 同理 这是 web 服务器的上传路径
-TEST_CASE_DIR =    os.path.join(BASE_DIR, 'test_case/')
+TEST_CASE_DIR = os.path.join(BASE_DIR, 'test_case/')

 ALLOWED_HOSTS = []