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

2016-10-24 12:03:17 +02:00
parent 9313ea9d44 c64b4941d5
commit 64a8781e45
82 changed files with 654 additions and 1569 deletions
--- a/src/Wallabag/CoreBundle/Command/InstallCommand.php
+++ b/src/Wallabag/CoreBundle/Command/InstallCommand.php
@ -380,7 +380,7 @@ class InstallCommand extends ContainerAwareCommand
            ],
            [
                'name' => 'piwik_host',
-                'value' => 'http://v2.wallabag.org',
+                'value' => 'v2.wallabag.org',
                'section' => 'analytics',
            ],
            [