diff options
| author | prathamesh | 2016-09-23 13:15:06 +0530 |
|---|---|---|
| committer | prathamesh | 2016-09-23 13:15:06 +0530 |
| commit | d4a0ace8042f590659b8e7ec02fcdc3a24fe0592 (patch) | |
| tree | fe804651f57ba0e364a11d1719edcf3d260f5ebe /yaksh/urls.py | |
| parent | 03e54d7f6a42c0d9207db554abba9da854d494e4 (diff) | |
| parent | 8e4ead8ab4caa9366e5357840e1912cbfb8cdb85 (diff) | |
| download | online_test-d4a0ace8042f590659b8e7ec02fcdc3a24fe0592.tar.gz online_test-d4a0ace8042f590659b8e7ec02fcdc3a24fe0592.tar.bz2 online_test-d4a0ace8042f590659b8e7ec02fcdc3a24fe0592.zip | |
Merge branch 'master' of https://github.com/FOSSEE/online_test into regrade_papers
Resolved
Conflicts:
yaksh/models.py
yaksh/test_models.py
yaksh/urls.py
yaksh/views.py
Diffstat (limited to 'yaksh/urls.py')
| -rw-r--r-- | yaksh/urls.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/yaksh/urls.py b/yaksh/urls.py index bbc5bdc..c4619b6 100644 --- a/yaksh/urls.py +++ b/yaksh/urls.py @@ -111,4 +111,5 @@ urlpatterns += [ url(r'^manage/regrade/paper/(?P<course_id>\d+)/(?P<answerpaper_id>\d+)/$', views.regrade, name='regrade'), url(r'^manage/(?P<mode>[\w\-]+)/(?P<quiz_id>\d+)/$', views.test_quiz), + url(r'^manage/create_demo_course/$', views.create_demo_course), ] |