summaryrefslogtreecommitdiff
path: root/ishtar_common/urls.py
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2016-10-22 13:51:30 +0200
committerÉtienne Loks <etienne.loks@iggdrasil.net>2016-10-22 13:51:30 +0200
commitcd1b777d6e95d1895780b414870ec27358ac0dd3 (patch)
tree904c5114a778b5d2bdeb688f842ef084caed4f97 /ishtar_common/urls.py
parent950cfb19a1c809e9d5e777c2750b3dd3f39bbf9f (diff)
parent480fa4f7e9a0ca6fed3b1f444807734d854de2b0 (diff)
downloadIshtar-cd1b777d6e95d1895780b414870ec27358ac0dd3.tar.bz2
Ishtar-cd1b777d6e95d1895780b414870ec27358ac0dd3.zip
Merge branch 'v0.9' into wheezy
Diffstat (limited to 'ishtar_common/urls.py')
-rw-r--r--ishtar_common/urls.py2
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/'