diff options
author | Ernesto Rico-Schmidt <e.rico.schmidt@gmail.com> | 2011-06-07 18:55:35 (GMT) |
---|---|---|
committer | Ernesto Rico-Schmidt <e.rico.schmidt@gmail.com> | 2011-06-07 18:55:35 (GMT) |
commit | 4d4b54e842c9651763a497e1fb26c672403e78e5 (patch) | |
tree | 61cca148195f76de63fb1880437ac1ee7ace8c2f /urls.py | |
parent | af0e543acb81dd8eb4cf68d35c70128fef389251 (diff) | |
parent | ede9fa059b6cbc82c7fd64c2f8009c9a250bc971 (diff) |
Merge branch 'master' of github.com:nnrcschmdt/helsinki
Diffstat (limited to 'urls.py')
-rw-r--r-- | urls.py | 5 |
1 files changed, 5 insertions, 0 deletions
@@ -7,6 +7,11 @@ admin.autodiscover() urlpatterns = patterns('', (r'^admin/', include(admin.site.urls)), (r'^program/', include('program.urls')), + (r'^programm/', include('program.urls')), # programcalendar.js has to link + # to /programm, so that deliverance integration works. that would + # break django compat, so this url rule is added. come up with a bttr + # solution and implement it to avoid redundancy and hacks. + # i don't care yet. (r'^nop', include('nop.urls')), (r'^tinymce/', include('tinymce.urls')), ) |