diff options
| author | Valérie-Emma Leroux <emma@iggdrasil.net> | 2017-04-07 11:40:31 +0200 |
|---|---|---|
| committer | Valérie-Emma Leroux <emma@iggdrasil.net> | 2017-04-07 11:40:31 +0200 |
| commit | 7f22d3c20cc24debfe123425efa63ec5293e4b4c (patch) | |
| tree | f773b80964981c231c892ee5255b94285bc5620a /ishtar_common/urls.py | |
| parent | 9127307734c85b816ac7dbb539b565ffb106d60f (diff) | |
| parent | da4af2ab5d105f6d2ce442b517e532b7570616e3 (diff) | |
| download | Ishtar-7f22d3c20cc24debfe123425efa63ec5293e4b4c.tar.bz2 Ishtar-7f22d3c20cc24debfe123425efa63ec5293e4b4c.zip | |
Merge branch 'master' of git.iggdrasil.net:/srv/git/ishtar
Conflicts:
archaeological_operations/templates/ishtar/sheet_operation.html
Diffstat (limited to 'ishtar_common/urls.py')
| -rw-r--r-- | ishtar_common/urls.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/ishtar_common/urls.py b/ishtar_common/urls.py index 98bd55106..5abec4215 100644 --- a/ishtar_common/urls.py +++ b/ishtar_common/urls.py @@ -206,6 +206,10 @@ urlpatterns += patterns( name='activate-advanced-menu'), url(r'activate-simple-menu/$', 'activate_simple_shortcut_menu', name='activate-simple-menu'), + url(r'hide-shortcut-menu/$', 'hide_shortcut_menu', + name='hide-shortcut-menu'), + url(r'show-shortcut-menu/$', 'show_shortcut_menu', + name='show-shortcut-menu'), url(r'(?P<action_slug>' + actions + r')/$', 'action', name='action'), ) |