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

Merge branch 'master' into frontend

parents d54a9384 b573941d
......@@ -43,3 +43,4 @@ coverage.xml
# PyBuilder
......@@ -4,7 +4,7 @@ from api import views
urlpatterns = patterns('',
url(r'^$', views.index, name='index'),
url(r'^building/(?P<building>.+)/(?P<room_number>\d+)',, name='room'),
url(r'^building/(?P<building>[a-zA-Z]+)', views.building, name='building'),
url(r'^buildings/', views.buildings_list, name='buildings_list'),
url(r'^building/(?P<building>.+)/(?P<room_number>\d+)$',, name='room'),
url(r'^building/(?P<building>[a-zA-Z]+)$', views.building, name='building'),
url(r'^buildings/$', views.buildings_list, name='buildings_list'),
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