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 | 07fdeebc4538904e8103884b18a0d6d63cba35f6 (patch) | |
tree | 03308a5f22cb9d8d2ef1a5e49da50b58230f4d82 | |
parent | cbc3d9e31ea819bd983670b9cbe7a1049575553e (diff) | |
parent | 791a58772de5673438a1feb8ba98fd122052b657 (diff) | |
download | Ishtar-07fdeebc4538904e8103884b18a0d6d63cba35f6.tar.bz2 Ishtar-07fdeebc4538904e8103884b18a0d6d63cba35f6.zip |
Merge branch 'stable'
-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(), |