Merge branch 'master' into 2.0-dev

mbabker · mbabker · commit 650bc56d25a0 · 2020-03-07T17:19:42.000-06:00
diff --git a/.travis.yml b/.travis.yml
@@ -19,10 +19,9 @@ matrix:
     - php: 7.3
       # This empty flag removes the prefer-stable switch to cause dev dependencies to be installed
       env: COMPOSER_FLAGS=""
-    - php: 7.4snapshot
+    - php: 7.4
     - php: nightly
   allow_failures:
-    - php: 7.4snapshot
     - php: nightly
 
 before_script:
