Merge branch 'master' into v5.7.7

mzur · mzur · commit 19f560fe9ba4 · 2018-12-14T12:59:12.000+01:00
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
