Merge branch 'master' into v5.7.7

biigle · Dec 14, 2018 · 19f560f · 19f560f
2 parents 2fdb046 + 49db4e7
commit 19f560f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1 +1,2 @@
 /vendor/
+composer.lock
diff --git a/.travis.yml b/.travis.yml
@@ -1,12 +1,14 @@
 language: php
 install:
-    - rm -rf vendor
-    - composer install
+  - rm -rf vendor
+  - composer install
 script:
-    - vendor/bin/phpunit
+  - vendor/bin/phpunit
 sudo: false
 php:
   - 7.1
   - 7.2
 matrix:
   fast_finish: true
+notifications:
+  email: false