Merge conflict
This commit is contained in:
@@ -20,5 +20,6 @@ install:
|
||||
- echo nothing
|
||||
|
||||
script:
|
||||
- make deps
|
||||
- make build-devserver
|
||||
- make test-devserver
|
||||
|
||||
Reference in New Issue
Block a user