diff options
author | Le Jeune Yann <lj.yann@gmail.com> | 2011-01-29 13:24:20 +0100 |
---|---|---|
committer | Le Jeune Yann <lj.yann@gmail.com> | 2011-01-29 13:24:20 +0100 |
commit | d690055480ef14bf51b6d172f8a2af19e080e5ce (patch) | |
tree | d1d385f9f529231bf500550dce9f37342d8e8187 /ishtar/furnitures/urls.py | |
parent | def6a737e306aa04d6030475a793eb0c105b0065 (diff) | |
parent | cf50fe45a889946d62a5428fd50f68a349505180 (diff) | |
download | Ishtar-d690055480ef14bf51b6d172f8a2af19e080e5ce.tar.bz2 Ishtar-d690055480ef14bf51b6d172f8a2af19e080e5ce.zip |
Merge branch 'master' of ssh://lysithea.proxience.com/home/proxience/git/ishtar
Diffstat (limited to 'ishtar/furnitures/urls.py')
-rw-r--r-- | ishtar/furnitures/urls.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/ishtar/furnitures/urls.py b/ishtar/furnitures/urls.py index 08af1cd42..d20ae6035 100644 --- a/ishtar/furnitures/urls.py +++ b/ishtar/furnitures/urls.py @@ -69,8 +69,12 @@ urlpatterns += patterns('ishtar.furnitures.views', name='autocomplete-organization'), url(BASE_URL + r'autocomplete-file/$', 'autocomplete_file', name='autocomplete-file'), + url(BASE_URL + r'json-file/$', 'json_file', + name='json-file'), url(BASE_URL + r'autocomplete-operation/$', 'autocomplete_operation', name='autocomplete-operation'), + url(BASE_URL + r'json-operation/$', 'json_operation', + name='json-operation'), url(BASE_URL + r'update-current-item/$', 'update_current_item', name='update-current-item'), ) |