Merge branch 'master' into asset-pipeline

2012-05-22 15:44:27 -04:00
parent 8a89309338 0af8502c6d
commit 5eae41ee70
4 changed files with 18 additions and 0 deletions
--- a/urls.py
+++ b/urls.py
@@ -67,6 +67,7 @@ if settings.COURSEWARE_ENABLED:
        url(r'^edit_circuit/(?P<circuit>[^/]*)$', 'circuit.views.edit_circuit'),
        url(r'^save_circuit/(?P<circuit>[^/]*)$', 'circuit.views.save_circuit'),
        url(r'^calculate$', 'util.views.calculate'),
+        url(r'^heartbeat$', include('heartbeat.urls')),
    )

 if settings.ENABLE_MULTICOURSE: