Merge branch 'master' of github.com:srct/advisor

ff2d8f44 · Daniel W Bond · c99eee58 · 5b9252ed · ff2d8f44
Commit ff2d8f44 authored Mar 01, 2014 by Daniel W Bond
--- a/advisor/advisor/urls.py
+++ b/advisor/advisor/urls.py
@@ -9,4 +9,6 @@ urlpatterns = patterns('',
    # url(r'^blog/', include('blog.urls')),

    url(r'^admin/', include(admin.site.urls)),
+    url(r'^advisor/', include('mainapp.urls')),
 )
+