diff options
| author | prathamesh | 2014-06-05 19:09:41 +0530 |
|---|---|---|
| committer | prathamesh | 2014-06-05 19:09:41 +0530 |
| commit | ed11b7d8b71a70d0d07174ead0aa602ffad49df3 (patch) | |
| tree | be56751316a1b72ce00b66261c548a68386b1697 /testapp/exam/urls.py | |
| parent | e5cd3e59c0c29e0ebb8458a704dc3a1cac51f687 (diff) | |
| parent | 7481ac647eb08b29636041ce717fe7ac512a7562 (diff) | |
| download | online_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/urls.py')
0 files changed, 0 insertions, 0 deletions