diff options
| author | Jayaram R Pai | 2014-09-25 16:14:20 +0530 |
|---|---|---|
| committer | Jayaram R Pai | 2014-09-25 16:14:20 +0530 |
| commit | 0a1f6f7e58fb3ec9d3f9582a54b65e20f903c37f (patch) | |
| tree | 4fcb7494af1ba11a9582bb12ab5ec582639967d9 /scipy | |
| parent | b047e2143b719e9a693f421082f371f0b46b3a5d (diff) | |
| parent | a5d89d3cb8bd12a6acc3c6338d9edf94cde65474 (diff) | |
| download | scipy2014-0a1f6f7e58fb3ec9d3f9582a54b65e20f903c37f.tar.gz scipy2014-0a1f6f7e58fb3ec9d3f9582a54b65e20f903c37f.tar.bz2 scipy2014-0a1f6f7e58fb3ec9d3f9582a54b65e20f903c37f.zip | |
Merge branch 'devel'
Diffstat (limited to 'scipy')
| -rw-r--r-- | scipy/urls.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scipy/urls.py b/scipy/urls.py index 14eb39b..f4e2aa6 100644 --- a/scipy/urls.py +++ b/scipy/urls.py @@ -11,5 +11,5 @@ urlpatterns = patterns('', url(dajaxice_config.dajaxice_url, include('dajaxice.urls')), # For devel - # url(r'^2014/', include('website.urls', namespace='website')), + url(r'^2014/', include('website.urls', namespace='website')), ) |