diff options
author | Evgeny Fadeev <evgeny.fadeev@gmail.com> | 2013-05-01 21:20:55 -0400 |
---|---|---|
committer | Evgeny Fadeev <evgeny.fadeev@gmail.com> | 2013-05-01 21:20:55 -0400 |
commit | 16afbbcad1e5db4896a434e1ff57a1c3ba540fd1 (patch) | |
tree | 75bce9dd63238d566e3ce92cf1fc5da54d700b90 /askbot/urls.py | |
parent | cb01a8d0fc658821a9fcf313007da00a528c2008 (diff) | |
parent | 12994f9a796433b048fd1fd0b1b9582bba7c0fa5 (diff) | |
download | askbot-16afbbcad1e5db4896a434e1ff57a1c3ba540fd1.tar.gz askbot-16afbbcad1e5db4896a434e1ff57a1c3ba540fd1.tar.bz2 askbot-16afbbcad1e5db4896a434e1ff57a1c3ba540fd1.zip |
Merge branch 'github'
Diffstat (limited to 'askbot/urls.py')
-rw-r--r-- | askbot/urls.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/askbot/urls.py b/askbot/urls.py index d3426980..32867615 100644 --- a/askbot/urls.py +++ b/askbot/urls.py @@ -563,6 +563,7 @@ urlpatterns = patterns('', name = 'askbot_jsi18n' ), url('^messages/', include('group_messaging.urls')), + url('^settings/', include('livesettings.urls')), ) #todo - this url below won't work, because it is defined above |