From: Jeremy Benoist <jeremy.benoist@gmail.com>
Date: Wed, 20 Jul 2016 10:02:02 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/master' into 2.1
X-Git-Tag: 2.1.0~63
X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;ds=sidebyside;h=0faeabefa7faedb3a6a3675a5e49e947554adae9;p=github%2Fwallabag%2Fwallabag.git

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

0faeabefa7faedb3a6a3675a5e49e947554adae9
diff --cc .travis.yml
index 17c3abaf,1a33198a..dd8815c1
--- a/.travis.yml
+++ b/.travis.yml
@@@ -23,15 -20,13 +23,16 @@@ php
      - 5.5
      - 5.6
      - 7.0
+     - nightly
      - hhvm
  
 +node_js:
 +    - "5"
 +
  env:
 -    - DB=mysql
 -    - DB=pgsql
 -    - DB=sqlite
 +    - DB=mysql ASSETS=nobuild
 +    - DB=pgsql ASSETS=nobuild
 +    - DB=sqlite ASSETS=nobuild
  
  matrix:
      fast_finish: true