Merge remote-tracking branch 'origin/master' into 2.1

2016-07-20 12:02:02 +02:00
parent 2bb138ef6d 317fc6e684
commit 0faeabefa7
26 changed files with 149 additions and 64 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -23,6 +23,7 @@ php:
    - 5.5
    - 5.6
    - 7.0
+    - nightly
    - hhvm

 node_js: