Merge branch 'dev'

Brian Retterer · Brian Retterer · commit 915f1478868e · 2016-03-16T15:11:24.000-04:00
* dev:
  PHP 7 Support in Travis
diff --git a/.travis.yml b/.travis.yml
@@ -1,5 +1,6 @@
 language: php
 php:
+- 7.0
 - 5.6
 - 5.5
 - 5.4

-Original file line number
+Diff line change
@@ @@ -1,5 +1,6 @@ @@
 language: php
 php:
 +- 7.0
 - 5.6
 - 5.5
 - 5.4