Merge branch 'dev' into virusdefender-dev

* dev:
  ‰øÆÂ§‰øÆÊîπ‰∫ÜÊ∑ªÂä†ÈóÆÈ¢òȰµÈù¢jsÂèòÈáèÂêç,Ê∑ªÂä†ÈóÆÈ¢òÂäüËÉΩÊ≠£Â∏∏[CI SKIP]
  修改/oj/local_settings.py中的test_case上传路径,修复测试用例存储错误的bug

Conflicts:
	oj/local_settings.py
	template/admin/problem/add_problem.html
This commit is contained in:
virusdefender committed 2015-08-17 13:01:43 +08:00
commit 07349ba6e2
3 files changed
+10 -5

No files matched your search

+1
View File
@@ -30,3 +30,4 @@ DEBUG = True
TEST_CASE_DIR = os.path.join(BASE_DIR, 'test_case/')
DATABASE_ROUTERS = ['oj.db_router.DBRouter']