diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-10-22 13:41:02 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-10-22 13:41:02 +0200 |
| commit | dafc5d16f3095bad00356b6198afcd5bbeab61d6 (patch) | |
| tree | 7040d1fd325ba67b890122059a8f50a3857e332a /ishtar_common/urls.py | |
| parent | 64bb69c03ce1688c72b3f7ebd0e1550cd941aa69 (diff) | |
| parent | 0ecd905165193897129a71a1e8203232f0b2b68c (diff) | |
| download | Ishtar-dafc5d16f3095bad00356b6198afcd5bbeab61d6.tar.bz2 Ishtar-dafc5d16f3095bad00356b6198afcd5bbeab61d6.zip | |
Merge branch 'master' into v0.9
Diffstat (limited to 'ishtar_common/urls.py')
| -rw-r--r-- | ishtar_common/urls.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/ishtar_common/urls.py b/ishtar_common/urls.py index 22a09a052..edd1ebe75 100644 --- a/ishtar_common/urls.py +++ b/ishtar_common/urls.py @@ -135,6 +135,8 @@ urlpatterns += patterns( url(r'pin/(?P<item_type>[a-z-]+)/(?P<pk>\d+)/$', 'update_current_item', name='pin'), url(r'unpin/(?P<item_type>[a-z-]+)/$', 'unpin', name='unpin'), + url(r'get-by-importer/(?P<slug>[a-z-]+)/(?P<type>[a-z-]+)?$', + 'get_by_importer', name='get-by-importer'), url(r'new-person/(?:(?P<parent_name>[^/]+)/)?(?:(?P<limits>[^/]+)/)?$', 'new_person', name='new-person'), url(r'new-person-noorga/' |