summaryrefslogtreecommitdiff
path: root/testapp/exam/models.py
diff options
context:
space:
mode:
authorprathamesh2014-06-05 19:09:41 +0530
committerprathamesh2014-06-05 19:09:41 +0530
commited11b7d8b71a70d0d07174ead0aa602ffad49df3 (patch)
treebe56751316a1b72ce00b66261c548a68386b1697 /testapp/exam/models.py
parente5cd3e59c0c29e0ebb8458a704dc3a1cac51f687 (diff)
parent7481ac647eb08b29636041ce717fe7ac512a7562 (diff)
downloadonline_test-ed11b7d8b71a70d0d07174ead0aa602ffad49df3.tar.gz
online_test-ed11b7d8b71a70d0d07174ead0aa602ffad49df3.tar.bz2
online_test-ed11b7d8b71a70d0d07174ead0aa602ffad49df3.zip
Merge branch 'scilab_check' into scilab_autocheck
Conflicts: testapp/exam/forms.py
Diffstat (limited to 'testapp/exam/models.py')
-rw-r--r--testapp/exam/models.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/testapp/exam/models.py b/testapp/exam/models.py
index 713260b..758091f 100644
--- a/testapp/exam/models.py
+++ b/testapp/exam/models.py
@@ -23,6 +23,7 @@ QUESTION_TYPE_CHOICES = (
("C", "C Language"),
("C++", "C++ Language"),
("java", "Java Language"),
+ ("scilab", "Scilab"),
)
################################################################################