Merge branch 'master' of https://github.com/PHPMailer/PHPMailer

digitalspitfire · Aug 5, 2014 · 0b34a1a · 0b34a1a
2 parents 45a4c29 + 1522094
commit 0b34a1a
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,8 +1,15 @@
 language: php
 php:
+  - 5.6
   - 5.5
   - 5.4
   - 5.3
+  - hhvm
+
+matrix:
+    allow_failures:
+        - php: hhvm
+
 before_install:
   - sudo apt-get update -qq
   - sudo apt-get install -y -qq postfix