Merge pull request #2353 from wallabag/assets-fix

Basically, fix everything

diff --cc .travis.yml
index 4170ff043002f5a657ce69ec3ffdaa23f20b452e,b967293668155efe98ea923813cbd854bf9c802d..f1334f5265ccdd27f8b2f5e4b4b7669b1459bcef
--- 1/.travis.yml
--- 2/.travis.yml
+++ b/.travis.yml
@@@ -41,11 -41,29 +41,9 @@@ env
  matrix:
      fast_finish: true
      include:
 -        # driver for PostgreSQL currently unsupported by HHVM, requires 3rd party dependency
 -        - php: hhvm-3.12
 -          sudo: required
 -          dist: trusty
 -          group: edge
 -          env: DB=mysql
 -          addons:
 -            apt:
 -                packages:
 -                    - mysql-server-5.6
 -                    - mysql-client-core-5.6
 -                    - mysql-client-5.6
 -          services:
 -            - mysql
 -        - php: hhvm-3.12
 -          sudo: required
 -          dist: trusty
 -          group: edge
 -          env: DB=sqlite
          - php: 7.0
-           env: CS_FIXER=run VALIDATE_TRANSLATION_FILE=run DB=sqlite
-         - php: 7.0
-           env: DB=sqlite ASSETS=build
+           env: CS_FIXER=run VALIDATE_TRANSLATION_FILE=run ASSETS=build DB=sqlite
      allow_failures:
 -        - php: hhvm-3.12
          - php: 7.1
          - php: nightly
  

diff --cc docs/de/user/installation.rst
Simple merge

diff --cc docs/en/user/installation.rst
Simple merge

diff --cc docs/fr/user/installation.rst
Simple merge