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

2016-08-22 23:03:16 +02:00
parent 9c545fe028 80bb0b7344
commit 79efca1e6f
45 changed files with 494 additions and 153 deletions
--- a/docs/en/user/installation.rst
+++ b/docs/en/user/installation.rst
@ -53,7 +53,7 @@ To install wallabag itself, you must run the following commands:

    git clone https://github.com/wallabag/wallabag.git
    cd wallabag
-    git checkout 2.0.5
+    git checkout 2.0.7
    SYMFONY_ENV=prod composer install --no-dev -o --prefer-dist
    php bin/console wallabag:install --env=prod