xuyue/OnlineJudge
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'hohoTT-dev' into virusdefender-dev

Browse Source 
* hohoTT-dev:
  前台比赛、比赛题目与普通题目的一系列界面

Conflicts:
	submission/views.py
	template/oj/contest/contest_problem.html
	template/oj/problem/my_submission.html
This commit is contained in:
virusdefender committed 2015-08-25 10:33:44 +08:00
2 parents 7b7e7131b8 48eb2d1e9b
commit a82f46a001
24 files changed
+573 -206
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

static/src/css/oj.css
+1 -1
View File
@@ -90,5 +90,5 @@ li.list-group-item {
}
.contest-tab{
margin-bottom: 5px;
margin-bottom: 15px;
}