summaryrefslogtreecommitdiffstats
path: root/askbot/urls.py
diff options
context:
space:
mode:
authorAdolfo Fitoria <adolfo.fitoria@gmail.com>2012-08-18 20:39:55 -0600
committerAdolfo Fitoria <adolfo.fitoria@gmail.com>2012-08-18 23:20:36 -0600
commitab51143f258e7d315fb12db9b12537b038707180 (patch)
tree00491d43ece6043e949c18e0de17231c40cc6c28 /askbot/urls.py
parentb378faef17ebbdb66675ced91552811c54aae889 (diff)
parent8b41842bfc6461a8b2f9b6bc9d80a3a82d54e81d (diff)
downloadaskbot-ab51143f258e7d315fb12db9b12537b038707180.tar.gz
askbot-ab51143f258e7d315fb12db9b12537b038707180.tar.bz2
askbot-ab51143f258e7d315fb12db9b12537b038707180.zip
Merge branch 'user-groups' of github.com:ASKBOT/askbot-devel into user-groups
Diffstat (limited to 'askbot/urls.py')
-rw-r--r--askbot/urls.py13
1 files changed, 11 insertions, 2 deletions
diff --git a/askbot/urls.py b/askbot/urls.py
index 8beaa6ba..c55e552e 100644
--- a/askbot/urls.py
+++ b/askbot/urls.py
@@ -72,11 +72,20 @@ urlpatterns = patterns('',
),
# END main page urls
-
url(
r'^api/get_questions/',
views.commands.api_get_questions,
- name = 'api_get_questions'
+ name='api_get_questions'
+ ),
+ url(
+ r'^get-thread-shared-users/',
+ views.commands.get_thread_shared_users,
+ name='get_thread_shared_users'
+ ),
+ url(
+ r'^get-thread-shared-groups/',
+ views.commands.get_thread_shared_groups,
+ name='get_thread_shared_groups'
),
url(
r'^save-draft-question/',