diff options
| author | Prabhu Ramachandran | 2013-04-27 15:28:28 +0530 |
|---|---|---|
| committer | Prabhu Ramachandran | 2013-04-27 15:28:28 +0530 |
| commit | 8b6ac259503323bc3d8333382d3769e5d10f162a (patch) | |
| tree | 5d260a3db043492ef731b4241cf0f07563591743 /testapp/urls.py | |
| parent | fd044e4a9f08366c9425cb241b7452da2ba904e1 (diff) | |
| parent | 5c7f66806e4be50985655b7c12bf3190ee91ae46 (diff) | |
| download | online_test-8b6ac259503323bc3d8333382d3769e5d10f162a.tar.gz online_test-8b6ac259503323bc3d8333382d3769e5d10f162a.tar.bz2 online_test-8b6ac259503323bc3d8333382d3769e5d10f162a.zip | |
Merge branch 'model_changes' of ...
https://github.com/hardythe1/online_test into master.
Conflicts:
production.cfg
testapp/production.py
Diffstat (limited to 'testapp/urls.py')
| -rw-r--r-- | testapp/urls.py | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/testapp/urls.py b/testapp/urls.py index d956bfc..c82ecb6 100644 --- a/testapp/urls.py +++ b/testapp/urls.py @@ -15,9 +15,15 @@ else: urlpatterns = patterns('', url(URL_BASE, include('exam.urls')), - + #url(r'^admin/', include(admin.site.urls)), # Uncomment the admin/doc line below to enable admin documentation: # url(r'^admin/doc/', include('django.contrib.admindocs.urls')), # Uncomment the next line to enable the admin: url(ADMIN_BASE, include(admin.site.urls)), + +) + +urlpatterns += patterns('', + url(r'^taggit_autocomplete_modified/', include\ + ('taggit_autocomplete_modified.urls')), ) |