Merge remote-tracking branch 'origin/cis' into cis

WyriHaximus · WyriHaximus · commit b99b2eb17a54 · 2016-10-27T17:30:10.000+02:00
diff --git a/.travis.yml b/.travis.yml
@@ -55,7 +55,7 @@ install:
   - composer show
 
 ## Run the actual test
-script: make travis
+script: make ci
 
 ## Gather coverage and set it to coverage servers
-after_script: make travis-coverage
+after_script: make ci-coverage
