summaryrefslogtreecommitdiffstats
path: root/urls.py
diff options
context:
space:
mode:
authorEvgeny Fadeev <evgeny.fadeev@gmail.com>2010-05-05 20:45:47 -0400
committerEvgeny Fadeev <evgeny.fadeev@gmail.com>2010-05-05 20:45:47 -0400
commit3e7728f6a8ed952e1071223dc8ec2b4ede5a9462 (patch)
tree466ea5d9a324d566cc53e1a923884cbab931ba38 /urls.py
parent8130338044d635ce9038d7dd58af06f59cc330bc (diff)
parente76b6412adbc73b259598c13520219b5f568071b (diff)
downloadaskbot-3e7728f6a8ed952e1071223dc8ec2b4ede5a9462.tar.gz
askbot-3e7728f6a8ed952e1071223dc8ec2b4ede5a9462.tar.bz2
askbot-3e7728f6a8ed952e1071223dc8ec2b4ede5a9462.zip
Merge branch 'master' into admin-interface
Diffstat (limited to 'urls.py')
-rw-r--r--urls.py5
1 files changed, 5 insertions, 0 deletions
diff --git a/urls.py b/urls.py
index f73eb497..4fb65435 100644
--- a/urls.py
+++ b/urls.py
@@ -11,3 +11,8 @@ urlpatterns = patterns('',
(r'^admin/', include(admin.site.urls)),
(r'^settings/', include('livesettings.urls')),
)
+
+if 'rosetta' in settings.INSTALLED_APPS:
+ urlpatterns += patterns('',
+ url(r'^rosetta/', include('rosetta.urls')),
+ )