oss/wallabag
oss/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2025-08-01 17:38:38 +00:00
Code Wiki Activity

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

Browse source
This commit is contained in:
Jeremy Benoist 2016-11-03 16:41:29 +01:00
commit 5a619812ca
No known key found for this signature in database
GPG key ID: BCA73962457ACC3C
60 changed files with 2477 additions and 1936 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/Wallabag/ImportBundle/Command/ImportCommand.php
View file

@ -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');