Merge with master.

This commit is contained in:
Nicholas Staples
2016-03-29 22:50:40 +01:00
parent 3e16fc1962
commit 644336b151
16 changed files with 91 additions and 162 deletions

View File

@@ -1,5 +1,4 @@
from flask import url_for
from app.main.dao import services_dao
def test_get_should_render_add_service_template(app_,