Commit ff2d8f44 authored by Daniel W Bond's avatar Daniel W Bond
Browse files

Merge branch 'master' of

parents c99eee58 5b9252ed
......@@ -9,4 +9,6 @@ urlpatterns = patterns('',
# url(r'^blog/', include('blog.urls')),
url(r'^admin/', include(,
url(r'^advisor/', include('mainapp.urls')),
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment