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