diff options
| author |  Tom Willemsen | 2011-11-05 00:33:54 +0100 |
|---|---|---|
| committer | Tom Willemsen | 2011-11-05 00:33:54 +0100 |
| commit | cb59bfad718fb4c434acd3280eba01dc734e74e4 (patch) | |
| tree | f8fa84433ce610574e32fb51939953d22e29b4db /urls.py | |
| parent | e533b3b82e254e2c22ed40a570b5e8b31a1f126b (diff) | |
| parent | fc51d7160df5ce97bfeba64a5af8efe2962223dd (diff) | |
| download | dotfiles-cb59bfad718fb4c434acd3280eba01dc734e74e4.tar.gz dotfiles-cb59bfad718fb4c434acd3280eba01dc734e74e4.zip | |
Merge branch 'markdown-powered'
Diffstat (limited to 'urls.py')
| -rw-r--r-- | urls.py | 4 |
1 files changed, 4 insertions, 0 deletions
@@ -15,4 +15,8 @@ urlpatterns = patterns('', if DEBUG: urlpatterns += patterns('', (r'^static/(?P<path>.*)$', 'django.views.static.serve', {'document_root': '%s/static' % DEPLOY_PATH}) + ) + +urlpatterns += patterns('', + (r'^', include("pages.urls")) ) |