diff options
| author | Étienne Loks <etienne.loks@proxience.com> | 2015-06-03 15:43:11 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@proxience.com> | 2015-06-03 15:43:11 +0200 |
| commit | e40dbf1a150b6c6d8c9a37357bc3af9b5d78dc02 (patch) | |
| tree | 03308a5f22cb9d8d2ef1a5e49da50b58230f4d82 /ishtar_common | |
| parent | 712b4f41ae86bc0ff8baa3c54d568a4e88bab502 (diff) | |
| parent | 76cbfac0c412477a679ae990e3b8eb238dd43d60 (diff) | |
| download | Ishtar-e40dbf1a150b6c6d8c9a37357bc3af9b5d78dc02.tar.bz2 Ishtar-e40dbf1a150b6c6d8c9a37357bc3af9b5d78dc02.zip | |
Merge branch 'stable'
Diffstat (limited to 'ishtar_common')
| -rw-r--r-- | ishtar_common/urls.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ishtar_common/urls.py b/ishtar_common/urls.py index ac3e0c248..bce968b51 100644 --- a/ishtar_common/urls.py +++ b/ishtar_common/urls.py @@ -66,7 +66,7 @@ urlpatterns = patterns('', name='organization_person_edit'), url(r'account_management/(?P<step>.+)?$', views.account_management_wizard, name='account_management'), - url(r'^import/$', views.NewImportView.as_view(), name='new_import'), + url(r'^import-new/$', views.NewImportView.as_view(), name='new_import'), url(r'^import-list/$', views.ImportListView.as_view(), name='current_imports'), url(r'^import-list-old/$', views.ImportOldListView.as_view(), |