Merge branch 'master' into develop

raulolteanu-sudo · Apr 12, 2017 · aa545cc · aa545cc
2 parents bc04e1b + 59eb988
commit aa545cc
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -7,8 +7,9 @@ python:
   - "3.5-dev" # 3.5 development branch
   - "nightly" # currently points to 3.6-dev
 # command to install dependencies
-install: "pip install nose coverage"
-install: "pip install -r requirements.txt"
-install: "pip install -r django-requirements.txt"
+install: 
+  - "pip install nose coverage"
+  - "pip install -r requirements.txt"
+  - "pip install -r django-requirements.txt"
 # command to run tests
 script: nosetests