diff options
| author | prathamesh | 2013-07-03 16:58:34 +0530 |
|---|---|---|
| committer | prathamesh | 2013-07-03 16:58:34 +0530 |
| commit | 8de499263ec00be5e500693b8db7f4b5ee0d15bd (patch) | |
| tree | a508cfbcd65d16ffb3801a218b6037a8b3bd555f /testapp/exam/urls.py | |
| parent | 156bb47ecebcca190683b8e59f917a5b742d11fd (diff) | |
| parent | b522a1ba1c1edff7648c6c7d69fa2867a08b4100 (diff) | |
| download | online_test-8de499263ec00be5e500693b8db7f4b5ee0d15bd.tar.gz online_test-8de499263ec00be5e500693b8db7f4b5ee0d15bd.tar.bz2 online_test-8de499263ec00be5e500693b8db7f4b5ee0d15bd.zip | |
Merge branch 'fresh_java' of https://github.com/prathamesh920/online_test into deploy_server
Conflicts:
testapp/templates/exam/question.html
Diffstat (limited to 'testapp/exam/urls.py')
0 files changed, 0 insertions, 0 deletions