diff options
| author | Madhusudan.C.S | 2010-11-18 16:10:38 +0530 |
|---|---|---|
| committer | Madhusudan.C.S | 2010-11-18 16:10:38 +0530 |
| commit | d6ea90a603cc63df5d150cd9bd99f72153169ea5 (patch) | |
| tree | cd5abd9c78a6a2e07624b9287e51772fbb51391b /project/urls.py | |
| parent | 30321b89d9435f1529122a93aacd37dde2db04c7 (diff) | |
| parent | 1e2a6b85b2f7bd9e391c4b700fbf5b62cb93e13f (diff) | |
| download | scipycon-d6ea90a603cc63df5d150cd9bd99f72153169ea5.tar.gz scipycon-d6ea90a603cc63df5d150cd9bd99f72153169ea5.tar.bz2 scipycon-d6ea90a603cc63df5d150cd9bd99f72153169ea5.zip | |
Merge the south migration branch with an additional field for Laptop registration number with default branch.
--HG--
branch : south-migration
Diffstat (limited to 'project/urls.py')
| -rw-r--r-- | project/urls.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/project/urls.py b/project/urls.py index 0ef4eef..d955f87 100644 --- a/project/urls.py +++ b/project/urls.py @@ -71,7 +71,9 @@ urlpatterns += patterns('project.scipycon.user.views', 'edit_profile', name='scipycon_edit_profile'), url(r'^%s/get-usernames/$' % (SCOPE_ARG_PATTERN), 'get_usernames', name='scipycon_get_usernames'), - ) + url(r'^%s/get-user-dump/$' % (SCOPE_ARG_PATTERN), + 'get_user_dump', name='scipycon_get_usernames')) + # Proceedings urlpatterns += patterns('project.scipycon.proceedings.views', |