Merge branch 'dev' into hohoTT-dev

Conflicts: contest_submission/tests.py
2015-08-28 15:26:10 +08:00
parent 7383b0f138 fbd0aac850
commit 2fbdf265c8
25 changed files with 649 additions and 422 deletions
--- a/contest_submission/tests.py
+++ b/contest_submission/tests.py
@@ -86,3 +86,4 @@ class ContestProblemMySubmissionListTest(TestCase):
                                                             created_by=self.user1,
                                                             contest=self.global_contest,
                                                             sort_index="a")
+