diff options
| author | Prabhu Ramachandran | 2017-01-16 21:59:30 +0530 |
|---|---|---|
| committer | GitHub | 2017-01-16 21:59:30 +0530 |
| commit | 10b4635ab0684a698382a3e167ef546bb3ff97b7 (patch) | |
| tree | cf75812acecffeb81081c9ba2632dfca481dd2ad /yaksh/demo_templates/demo_urls.py | |
| parent | d03826261adae349151e28d09ea2e2f85e168909 (diff) | |
| parent | 67ed7f2a9bd137d746f1535cd3faee4d42bdbc9b (diff) | |
| download | online_test-10b4635ab0684a698382a3e167ef546bb3ff97b7.tar.gz online_test-10b4635ab0684a698382a3e167ef546bb3ff97b7.tar.bz2 online_test-10b4635ab0684a698382a3e167ef546bb3ff97b7.zip | |
Merge pull request #177 from adityacp/fix_management_commands
Fix management commands
Diffstat (limited to 'yaksh/demo_templates/demo_urls.py')
| -rw-r--r-- | yaksh/demo_templates/demo_urls.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/yaksh/demo_templates/demo_urls.py b/yaksh/demo_templates/demo_urls.py index d99e473..5abc121 100644 --- a/yaksh/demo_templates/demo_urls.py +++ b/yaksh/demo_templates/demo_urls.py @@ -1,5 +1,6 @@ from django.conf.urls import patterns, include, url - +from django.conf import settings +from django.conf.urls.static import static from django.contrib import admin admin.autodiscover() @@ -9,5 +10,7 @@ urlpatterns = patterns('', # url(r'^blog/', include('blog.urls')), url(r'^admin/', include(admin.site.urls)), - url(r'^exam/', include('yaksh.urls')), + url(r'^exam/', include('yaksh.urls', namespace='yaksh', app_name='yaksh')), + url(r'^', include('social.apps.django_app.urls', namespace='social')), ) +urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
\ No newline at end of file |