Merge conflict

This commit is contained in:
Arthur Barr
2018-03-05 10:59:41 +00:00
2 changed files with 2 additions and 1 deletions

View File

@@ -20,5 +20,6 @@ install:
- echo nothing
script:
- make deps
- make build-devserver
- make test-devserver