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

2016-11-03 16:41:29 +01:00
parent da41365579 84795d015b
commit 5a619812ca
60 changed files with 2477 additions and 1936 deletions
--- a/src/Wallabag/ImportBundle/Command/ImportCommand.php
+++ b/src/Wallabag/ImportBundle/Command/ImportCommand.php
@ -56,6 +56,9 @@ class ImportCommand extends ContainerAwareCommand
            case 'instapaper':
                $import = $this->getContainer()->get('wallabag_import.instapaper.import');
                break;
+            case 'instapaper':
+                $wallabag = $this->getContainer()->get('wallabag_import.instapaper.import');
+                break;
            case 'v1':
            default:
                $import = $this->getContainer()->get('wallabag_import.wallabag_v1.import');