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

2016-08-28 16:15:27 +02:00
parent 13d44ca766 985f5f9d05
commit cdd3010b47
13 changed files with 192 additions and 6 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -62,6 +62,7 @@ matrix:
          env: DB=sqlite ASSETS=build
    allow_failures:
        - php: hhvm-3.12
+        - php: 7.1
        - php: nightly

 # exclude v1 branches